diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 14:19:46 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 14:19:46 +0000 |
| commit | 7b862a32d4f20c96e2a98c39e26b4c6b77f9e1cc (patch) | |
| tree | d5a1c4a63ba28798fd5606f9f0ccc9026a2bb164 /chrome/common | |
| parent | bd451fbf4225344caa9059b707b2ae8ad947a2bf (diff) | |
| download | chromium_src-7b862a32d4f20c96e2a98c39e26b4c6b77f9e1cc.zip chromium_src-7b862a32d4f20c96e2a98c39e26b4c6b77f9e1cc.tar.gz chromium_src-7b862a32d4f20c96e2a98c39e26b4c6b77f9e1cc.tar.bz2 | |
Peek at the event queue for wheel events for cros
BUG=NONE
Test=RenderWidgetHostTest.CoalescesWheelEvents (existing)
Review URL: http://codereview.chromium.org/2679003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 5 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index eed0427..4ded0ea 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -917,8 +917,11 @@ const char kStartupManifest[] = "startup-manifest"; // TODO(denisromanov): delete this when not needed for testing. const char kServicesManifest[] = "services-manifest"; +#endif + +#if defined(OS_LINUX) // Specify the amount the trackpad should scroll by. -const char kVertScrollDelta[] = "vert-scroll-delta"; +const char kScrollPixels[] = "scroll-pixels"; #endif #if defined(OS_MACOSX) || defined(OS_WIN) diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 13533c8..9201666 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -265,7 +265,10 @@ extern const char kChromeosFrame[]; extern const char kStartupManifest[]; // TODO(denisromanov): Remove this flag when it is not needed for testing, too. extern const char kServicesManifest[]; -extern const char kVertScrollDelta[]; +#endif + +#if defined(OS_LINUX) +extern const char kScrollPixels[]; #endif #if defined(OS_MACOSX) || defined(OS_WIN) |