diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 09:04:27 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 09:04:27 +0000 |
| commit | bbd08266ba6e5c1c8979a0fdee54450bf821fafe (patch) | |
| tree | e9a6828fc2cb9e4fa28801cd614d4a2b489b786e /chromeos | |
| parent | de21b71a964c0bc3cf0df02b501600781f5a8333 (diff) | |
| download | chromium_src-bbd08266ba6e5c1c8979a0fdee54450bf821fafe.zip chromium_src-bbd08266ba6e5c1c8979a0fdee54450bf821fafe.tar.gz chromium_src-bbd08266ba6e5c1c8979a0fdee54450bf821fafe.tar.bz2 | |
Revert 231699 "Remove kNaturalScrollDefault."
Many tests started failing at ui::ShouldDefaultToNaturalScroll(), e.g.,
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/26125/steps/unit_tests/logs/TestFocusNotification
> Remove kNaturalScrollDefault.
>
> We have a runtime check - IsTouchDevicePresent, so just use that instead of the flag.
>
> BUG=NONE
> TEST=manual
>
> Review URL: https://codereview.chromium.org/33913003
TBR=achuith@chromium.org
Review URL: https://codereview.chromium.org/52223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index b9af049..42ffe24 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -157,6 +157,9 @@ const char kLoginProfile[] = "login-profile"; // Specifies the user which is already logged in. const char kLoginUser[] = "login-user"; +// Enables natural scroll by default. +const char kNaturalScrollDefault[] = "enable-natural-scroll-default"; + // Skips all other OOBE pages after user login. const char kOobeSkipPostLogin[] = "oobe-skip-postlogin"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index d00d9a9..7218df3 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -62,6 +62,7 @@ CHROMEOS_EXPORT extern const char kLoginManager[]; CHROMEOS_EXPORT extern const char kLoginPassword[]; CHROMEOS_EXPORT extern const char kLoginProfile[]; CHROMEOS_EXPORT extern const char kLoginUser[]; +CHROMEOS_EXPORT extern const char kNaturalScrollDefault[]; CHROMEOS_EXPORT extern const char kOobeSkipPostLogin[]; CHROMEOS_EXPORT extern const char kSkipHWIDCheck[]; CHROMEOS_EXPORT extern const char kSmsTestMessages[]; |