r167590 - in trunk/src: chrome/browser/chromeos/login content/browser/renderer_host content/public/common

[de...@chromium.org]

Author: de...@chromium.org
Date: Tue Nov 13 20:11:05 2012
New Revision: 167590

Log:
linux: Remove --scroll-pixels flag.

This was added while the scroll speed was being tweaked for
Chrome OS, but we don't rely on this code path anymore.

BUG=154776
TEST=touchpad and external mouse work as before on chrome os
lumpy device; external mouse works as before in a GTK
build


Review URL: https://chromiumcodereview.appspot.com/11377147

Modified:
trunk/src/chrome/browser/chromeos/login/login_utils.cc
trunk/src/content/browser/renderer_host/render_widget_host_view_gtk.cc
trunk/src/content/public/common/content_switches.cc
trunk/src/content/public/common/content_switches.h

Modified: trunk/src/chrome/browser/chromeos/login/login_utils.cc
==============================================================================
--- trunk/src/chrome/browser/chromeos/login/login_utils.cc (original)
+++ trunk/src/chrome/browser/chromeos/login/login_utils.cc Tue Nov 13 20:11:05 2012
@@ -774,7 +774,6 @@
::switches::kGpuStartupDialog,
::switches::kHasChromeOSKeyboard,
::switches::kLoginProfile,
- ::switches::kScrollPixels,
::switches::kNaturalScrollDefault,
::switches::kNoFirstRun,
::switches::kNoSandbox,

Modified: trunk/src/content/browser/renderer_host/render_widget_host_view_gtk.cc
==============================================================================
--- trunk/src/content/browser/renderer_host/render_widget_host_view_gtk.cc (original)
+++ trunk/src/content/browser/renderer_host/render_widget_host_view_gtk.cc Tue Nov 13 20:11:05 2012
@@ -456,27 +456,6 @@
return TRUE;
}

- // Allow the vertical scroll delta to be overridden from the command line.
- // This will allow us to test more easily to discover the amount
- // (either hard coded or computed) that's best.
- static float GetScrollPixelsPerTick() {
- static float scroll_pixels = -1;
- if (scroll_pixels < 0) {
- // TODO(brettw): Remove the command line switch (crbug.com/63525)
- scroll_pixels = kDefaultScrollPixelsPerTick;
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- std::string scroll_pixels_option =
- command_line->GetSwitchValueASCII(switches::kScrollPixels);
- if (!scroll_pixels_option.empty()) {
- double v;
- if (base::StringToDouble(scroll_pixels_option, &v))
- scroll_pixels = static_cast<float>(v);
- }
- DCHECK_GT(scroll_pixels, 0);
- }
- return scroll_pixels;
- }
-
// Return the net up / down (or left / right) distance represented by events
// in the events will be removed from the queue. We only look at the top of
// queue...any other type of event will cause us not to look farther.
@@ -522,7 +501,7 @@
gdk_event_put(event);
gdk_event_free(event);
}
- return num_clicks * GetScrollPixelsPerTick();
+ return num_clicks * kDefaultScrollPixelsPerTick;
}

static gboolean OnMouseScrollEvent(GtkWidget* widget,
@@ -546,15 +525,15 @@
if (event->direction == GDK_SCROLL_UP ||
event->direction == GDK_SCROLL_DOWN) {
if (event->direction == GDK_SCROLL_UP)
- web_event.deltaY = GetScrollPixelsPerTick();
+ web_event.deltaY = kDefaultScrollPixelsPerTick;
else
- web_event.deltaY = -GetScrollPixelsPerTick();
+ web_event.deltaY = -kDefaultScrollPixelsPerTick;
web_event.deltaY += GetPendingScrollDelta(true, event->state);
} else {
if (event->direction == GDK_SCROLL_LEFT)
- web_event.deltaX = GetScrollPixelsPerTick();
+ web_event.deltaX = kDefaultScrollPixelsPerTick;
else
- web_event.deltaX = -GetScrollPixelsPerTick();
+ web_event.deltaX = -kDefaultScrollPixelsPerTick;
web_event.deltaX += GetPendingScrollDelta(false, event->state);
}
RenderWidgetHostImpl::From(

Modified: trunk/src/content/public/common/content_switches.cc
==============================================================================
--- trunk/src/content/public/common/content_switches.cc (original)
+++ trunk/src/content/public/common/content_switches.cc Tue Nov 13 20:11:05 2012
@@ -692,11 +692,6 @@
const char kChildCleanExit[] = "child-clean-exit";
#endif

-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-// Specify the amount the trackpad should scroll by.
-const char kScrollPixels[] = "scroll-pixels";
-#endif
-
#if defined(OS_MACOSX) || defined(OS_WIN)
// Use the system SSL library (Secure Transport on Mac, SChannel on Windows)
// instead of NSS for SSL.

Modified: trunk/src/content/public/common/content_switches.h
==============================================================================
--- trunk/src/content/public/common/content_switches.h (original)
+++ trunk/src/content/public/common/content_switches.h Tue Nov 13 20:11:05 2012
@@ -223,10 +223,6 @@
extern const char kChildCleanExit[];
#endif

-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-extern const char kScrollPixels[];
-#endif
-
#if defined(OS_MACOSX) || defined(OS_WIN)
extern const char kUseSystemSSL[];
#endif