From bbd08266ba6e5c1c8979a0fdee54450bf821fafe Mon Sep 17 00:00:00 2001 From: "kinaba@chromium.org" Date: Wed, 30 Oct 2013 09:04:27 +0000 Subject: 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 --- chromeos/chromeos_switches.cc | 3 +++ chromeos/chromeos_switches.h | 1 + 2 files changed, 4 insertions(+) (limited to 'chromeos') 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[]; -- cgit v1.1