diff options
author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 05:09:38 +0000 |
---|---|---|
committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 05:09:38 +0000 |
commit | 0027fde1bff9ad57c191c3bb3362a410e97e9883 (patch) | |
tree | 52f996ed92ed1a522daa617417b69fa376210a17 /chrome/browser/chromeos/preferences.cc | |
parent | 06882227b51e8d17d30ec8ee9d5cc8b8e1c81d0d (diff) | |
download | chromium_src-0027fde1bff9ad57c191c3bb3362a410e97e9883.zip chromium_src-0027fde1bff9ad57c191c3bb3362a410e97e9883.tar.gz chromium_src-0027fde1bff9ad57c191c3bb3362a410e97e9883.tar.bz2 |
ChromeOS Mouse settings.
Split out pointer, touchpad and mouse settings.
BUG=chromium-os:22305
TEST=chrome://settings/system should have separate pointer, touchpad and mouse settings.
Review URL: http://codereview.chromium.org/8905025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/preferences.cc')
-rw-r--r-- | chrome/browser/chromeos/preferences.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 6be339a..b933e7d 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -44,6 +44,9 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, false, PrefService::SYNCABLE_PREF); + prefs->RegisterBooleanPref(prefs::kPrimaryMouseButtonRight, + false, + PrefService::SYNCABLE_PREF); prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false, PrefService::UNSYNCABLE_PREF); @@ -208,6 +211,8 @@ void Preferences::Init(PrefService* prefs) { accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this); + primary_mouse_button_right_.Init(prefs::kPrimaryMouseButtonRight, + prefs, this); language_hotkey_next_engine_in_menu_.Init( prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); language_hotkey_previous_engine_.Init( @@ -309,6 +314,14 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { "Touchpad.Sensitivity.Started", sensitivity, 1, 5, 5); } } + if (!pref_name || *pref_name == prefs::kPrimaryMouseButtonRight) { + const bool right = primary_mouse_button_right_.GetValue(); + system::mouse_settings::SetPrimaryButtonRight(right); + if (pref_name) + UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonLeft.Changed", right); + else + UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonLeft.Started", right); + } // We don't handle prefs::kLanguageCurrentInputMethod and PreviousInputMethod // here. |