Add non-syncable pref for mouse sensitivity.

BUG=119647
TEST=Sensitivity slider for mouse works.
Review URL: https://chromiumcodereview.appspot.com/9968028

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

6 files changed, 40 insertions, 20 deletions

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index c461ad9..ede7d19 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -95,6 +95,9 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
                                false,
                                PrefService::UNSYNCABLE_PREF);
   }
+  prefs->RegisterIntegerPref(prefs::kMouseSensitivity,
+                             3,
+                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity,
                              3,
                              PrefService::UNSYNCABLE_PREF);
@@ -253,7 +256,8 @@ void Preferences::Init(PrefService* prefs) {
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
   natural_scroll_.Init(prefs::kNaturalScroll, prefs, this);
   accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this);
-  sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
+  mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this);
+  touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
   use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this);
   disable_gdata_.Init(prefs::kDisableGData, prefs, this);
   disable_gdata_over_cellular_.Init(prefs::kDisableGDataOverCellular,
@@ -363,9 +367,20 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
     else
       UMA_HISTOGRAM_BOOLEAN("Touchpad.NaturalScroll.Started", enabled);
   }
+  if (!pref_name || *pref_name == prefs::kMouseSensitivity) {
+    const int sensitivity = mouse_sensitivity_.GetValue();
+    system::mouse_settings::SetSensitivity(sensitivity);
+    if (pref_name) {
+      UMA_HISTOGRAM_CUSTOM_COUNTS(
+          "Mouse.Sensitivity.Changed", sensitivity, 1, 5, 5);
+    } else {
+      UMA_HISTOGRAM_CUSTOM_COUNTS(
+          "Mouse.Sensitivity.Started", sensitivity, 1, 5, 5);
+    }
+  }
   if (!pref_name || *pref_name == prefs::kTouchpadSensitivity) {
-    const int sensitivity = sensitivity_.GetValue();
-    system::pointer_settings::SetSensitivity(sensitivity);
+    const int sensitivity = touchpad_sensitivity_.GetValue();
+    system::touchpad_settings::SetSensitivity(sensitivity);
     if (pref_name) {
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Touchpad.Sensitivity.Changed", sensitivity, 1, 5, 5);
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 6485b58..ec85a01 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -92,7 +92,8 @@ class Preferences : public content::NotificationObserver {
   BooleanPrefMember vert_edge_scroll_enabled_;
   BooleanPrefMember accessibility_enabled_;
   IntegerPrefMember speed_factor_;
-  IntegerPrefMember sensitivity_;
+  IntegerPrefMember mouse_sensitivity_;
+  IntegerPrefMember touchpad_sensitivity_;
   BooleanPrefMember primary_mouse_button_right_;
   BooleanPrefMember use_24hour_clock_;
   BooleanPrefMember disable_gdata_;
diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc
index a099b31..bce8349 100644
--- a/chrome/browser/chromeos/system/input_device_settings.cc
+++ b/chrome/browser/chromeos/system/input_device_settings.cc
@@ -83,15 +83,6 @@ bool DeviceExists(const char* script) {
 
 }  // namespace
 
-namespace pointer_settings {
-
-void SetSensitivity(int value) {
-  SetPointerSensitivity(kTpControl, value);
-  SetPointerSensitivity(kMouseControl, value);
-}
-
-}  // namespace pointer_settings
-
 namespace touchpad_settings {
 
 bool TouchpadExists() {
@@ -107,6 +98,11 @@ bool TouchpadExists() {
   return exists;
 }
 
+// Sets the touchpad sensitivity in the range [1, 5].
+void SetSensitivity(int value) {
+  SetPointerSensitivity(kTpControl, value);
+}
+
 void SetTapToClick(bool enabled) {
   ExecuteScript(3, kTpControl, "taptoclick", enabled ? "on" : "off");
 }
@@ -119,6 +115,11 @@ bool MouseExists() {
   return DeviceExists(kMouseControl);
 }
 
+// Sets the touchpad sensitivity in the range [1, 5].
+void SetSensitivity(int value) {
+  SetPointerSensitivity(kMouseControl, value);
+}
+
 void SetPrimaryButtonRight(bool right) {
   ExecuteScript(3, kMouseControl, "swap_left_right", right ? "1" : "0");
 }
diff --git a/chrome/browser/chromeos/system/input_device_settings.h b/chrome/browser/chromeos/system/input_device_settings.h
index 156ae09..f29e076 100644
--- a/chrome/browser/chromeos/system/input_device_settings.h
+++ b/chrome/browser/chromeos/system/input_device_settings.h
@@ -9,17 +9,13 @@
 namespace chromeos {
 namespace system {
 
-namespace pointer_settings {
-
-// Sets the pointer sensitivity in the range [1, 5].
-void SetSensitivity(int value);
-
-}  // namespace pointer_settings
-
 namespace touchpad_settings {
 
 bool TouchpadExists();
 
+// Sets the touchpad sensitivity in the range [1, 5].
+void SetSensitivity(int value);
+
 // Turns tap to click on / off.
 void SetTapToClick(bool enabled);
 
@@ -29,6 +25,9 @@ namespace mouse_settings {
 
 bool MouseExists();
 
+// Sets the mouse sensitivity in the range [1, 5].
+void SetSensitivity(int value);
+
 void SetPrimaryButtonRight(bool right);
 
 }  // namespace mouse_settings
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 4338196..9df8bb8 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -459,6 +459,9 @@ const char kNaturalScroll[] = "settings.touchpad.natural_scroll";
 const char kPrimaryMouseButtonRight[] = "settings.mouse.primary_right";
 
 // A integer pref for the touchpad sensitivity.
+const char kMouseSensitivity[] = "settings.mouse.sensitivity2";
+
+// A integer pref for the touchpad sensitivity.
 const char kTouchpadSensitivity[] = "settings.touchpad.sensitivity2";
 
 // A boolean pref set to true if time should be displayed in 24-hour clock.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index aad4f93..6cc7d14 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -167,6 +167,7 @@ extern const char kAudioVolumePercent[];
 extern const char kTapToClickEnabled[];
 extern const char kNaturalScroll[];
 extern const char kPrimaryMouseButtonRight[];
+extern const char kMouseSensitivity[];
 extern const char kTouchpadSensitivity[];
 extern const char kUse24HourClock[];
 extern const char kDisableGData[];