Use a command line flag instead of board to force natural scroll on.

BUG=152795
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11099074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161456 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 13 deletions

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 66c5989..73c2944 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -37,17 +37,6 @@
 #include "unicode/timezone.h"
 
 namespace chromeos {
-namespace {
-
-// TODO(achuith): Get rid of this.
-bool IsLink() {
-  std::string board;
-  system::StatisticsProvider::GetInstance()->GetMachineStatistic(
-      "CHROMEOS_RELEASE_BOARD", &board);
-  return StartsWithASCII(board, "link", false);
-}
-
-}  // namespace
 
 static const char kFallbackInputMethodLocale[] = "en-US";
 
@@ -424,8 +413,10 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
       UMA_HISTOGRAM_BOOLEAN("Touchpad.ThreeFingerClick.Started", enabled);
   }
   if (!pref_name || *pref_name == prefs::kNaturalScroll) {
-    // If user is on link, force natural scroll to on.
-    if (IsLink() &&
+    // Force natural scroll to on if kNaturalScrollDefault is specified on the
+    // cmd line.
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kNaturalScrollDefault) &&
         !pref_name &&
         !prefs_->GetUserPrefValue(prefs::kNaturalScroll)) {
       natural_scroll_.SetValue(true);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e7da544..9bbcef2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1451,6 +1451,9 @@ const char kLoginUser[]                     = "login-user";
 // Specifies a password to be used to login (along with login-user).
 const char kLoginPassword[]                 = "login-password";
 
+// Enables natural scroll by default.
+const char kNaturalScrollDefault[]          = "enable-natural-scroll-default";
+
 // Disables tab discard in low memory conditions, a feature which silently
 // closes inactive tabs to free memory and to attempt to avoid the kernel's
 // out-of-memory process killer.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9506895..be7f554 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -396,6 +396,7 @@ extern const char kLoginScreenSize[];
 extern const char kLoginProfile[];
 extern const char kLoginUser[];
 extern const char kLoginPassword[];
+extern const char kNaturalScrollDefault[];
 extern const char kNoDiscardTabs[];
 extern const char kGuestSession[];
 extern const char kEchoExtensionPath[];