diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 20:09:31 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 20:09:31 +0000 |
| commit | 9a1d0d7f92dd754a4b29f8bd507a7cbeabce1c71 (patch) | |
| tree | f5c5c944da290436f5aeb527f27f31956ed24631 /chrome/browser/chromeos/preferences_browsertest.cc | |
| parent | 36c455852d581784b4181151ce61022de2fc04b7 (diff) | |
| download | chromium_src-9a1d0d7f92dd754a4b29f8bd507a7cbeabce1c71.zip chromium_src-9a1d0d7f92dd754a4b29f8bd507a7cbeabce1c71.tar.gz chromium_src-9a1d0d7f92dd754a4b29f8bd507a7cbeabce1c71.tar.bz2 | |
Revert of Don't handle NaturalScroll in Chrome but pass it to CMT instead (https://codereview.chromium.org/212603005/)
Reason for revert:
Has caused many compile failures. We think the trybots didn't catch it because they didn't build ash_unittests.
Example:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/46547
../../ash/sticky_keys/sticky_keys_unittest.cc: In member function 'virtual void ash::StickyKeysTest_ScrollEventOneshot_Test::TestBody()':
../../ash/sticky_keys/sticky_keys_unittest.cc:622:41:error: 'class ui::DeviceDataManager' has no member named 'set_natural_scroll_enabled'
../../ash/sticky_keys/sticky_keys_unittest.cc: In member function 'virtual void ash::StickyKeysTest_ScrollDirectionChanged_Test::TestBody()':
../../ash/sticky_keys/sticky_keys_unittest.cc:674:41:error: 'class ui::DeviceDataManager' has no member named 'set_natural_scroll_enabled'
../../ash/sticky_keys/sticky_keys_unittest.cc: In member function 'virtual void ash::StickyKeysTest_ScrollEventLocked_Test::TestBody()':
../../ash/sticky_keys/sticky_keys_unittest.cc:711:41:error: 'class ui::DeviceDataManager' has no member named 'set_natural_scroll_enabled'
ninja: build stopped: subcommand failed.
Original issue's description:
> Don't handle NaturalScroll in Chrome but pass it to CMT instead
>
> In order to support mice via CMT (Project Cobra) we will have to do
> the natural scroll handling in the CMT driver instead of Chrome.
>
> BUG=chromium:285663
> TEST=test with touchpads and traditional mice. Everything should work as before,
> touchpad should have natural scroll applied, scroll wheels should not.
> Test changing the natural scroll property and see if it's applied correctly.
> Also test if touch mice have natural scroll applied.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260926
TBR=achuith@chromium.org,sky@chromium.org,sadrul@chromium.org,denniskempin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=chromium:285663
Review URL: https://codereview.chromium.org/221363002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/preferences_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/preferences_browsertest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc index 295bb9f..e955511 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_browsertest.cc @@ -89,6 +89,8 @@ class PreferencesTest : public LoginManagerTest { EXPECT_EQ(prefs->GetBoolean(prefs::kEnableTouchpadThreeFingerClick), input_settings_->current_touchpad_settings() .GetThreeFingerClick()); + EXPECT_EQ(prefs->GetBoolean(prefs::kNaturalScroll), + ui::IsNaturalScrollEnabled()); EXPECT_EQ(prefs->GetInteger(prefs::kMouseSensitivity), input_settings_->current_mouse_settings().GetSensitivity()); EXPECT_EQ(prefs->GetInteger(prefs::kTouchpadSensitivity), |