diff options
| author | denniskempin@chromium.org <denniskempin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 19:37:16 +0000 |
|---|---|---|
| committer | denniskempin@chromium.org <denniskempin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 19:37:16 +0000 |
| commit | 3af120aca0b88e24f45dfec0fdd509cf769be0df (patch) | |
| tree | fb3b7fce74cd1f3d0da535f3b9392084d4864b7b /chrome/browser/ui/views/ash/tab_scrubber.cc | |
| parent | cb82a22c5ccf526ad4d7aea992d922253eb4e31e (diff) | |
| download | chromium_src-3af120aca0b88e24f45dfec0fdd509cf769be0df.zip chromium_src-3af120aca0b88e24f45dfec0fdd509cf769be0df.tar.gz chromium_src-3af120aca0b88e24f45dfec0fdd509cf769be0df.tar.bz2 | |
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.
Review URL: https://codereview.chromium.org/212603005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/ash/tab_scrubber.cc')
| -rw-r--r-- | chrome/browser/ui/views/ash/tab_scrubber.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/ash/tab_scrubber.cc b/chrome/browser/ui/views/ash/tab_scrubber.cc index 9cc6f46..49ef35a 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber.cc @@ -109,8 +109,6 @@ void TabScrubber::OnScrollEvent(ui::ScrollEvent* event) { event->StopPropagation(); float x_offset = event->x_offset(); - if (!ui::IsNaturalScrollEnabled()) - x_offset = -x_offset; int last_tab_index = highlighted_tab_ == -1 ? browser->tab_strip_model()->active_index() : highlighted_tab_; if (!scrubbing_) { |