| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 Preferences::~Preferences() {} | 37 Preferences::~Preferences() {} |
| 38 | 38 |
| 39 // static | 39 // static |
| 40 void Preferences::RegisterUserPrefs(PrefService* prefs) { | 40 void Preferences::RegisterUserPrefs(PrefService* prefs) { |
| 41 input_method::InputMethodManager* manager = | 41 input_method::InputMethodManager* manager = |
| 42 input_method::InputMethodManager::GetInstance(); | 42 input_method::InputMethodManager::GetInstance(); |
| 43 | 43 |
| 44 prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, | 44 prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, |
| 45 false, | 45 false, |
| 46 PrefService::SYNCABLE_PREF); | 46 PrefService::SYNCABLE_PREF); |
| 47 prefs->RegisterBooleanPref(prefs::kPrimaryMouseButtonRight, |
| 48 false, |
| 49 PrefService::SYNCABLE_PREF); |
| 47 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, | 50 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, |
| 48 false, | 51 false, |
| 49 PrefService::UNSYNCABLE_PREF); | 52 PrefService::UNSYNCABLE_PREF); |
| 50 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, | 53 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, |
| 51 false, | 54 false, |
| 52 PrefService::UNSYNCABLE_PREF); | 55 PrefService::UNSYNCABLE_PREF); |
| 53 // Check if the accessibility pref is already registered, which can happen | 56 // Check if the accessibility pref is already registered, which can happen |
| 54 // in WizardController::RegisterPrefs. We still want to try to register | 57 // in WizardController::RegisterPrefs. We still want to try to register |
| 55 // the pref here in case of Chrome/Linux with ChromeOS=1. | 58 // the pref here in case of Chrome/Linux with ChromeOS=1. |
| 56 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) { | 59 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) { |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 prefs->RegisterStringPref(prefs::kOAuth1Secret, | 204 prefs->RegisterStringPref(prefs::kOAuth1Secret, |
| 202 "", | 205 "", |
| 203 PrefService::UNSYNCABLE_PREF); | 206 PrefService::UNSYNCABLE_PREF); |
| 204 } | 207 } |
| 205 | 208 |
| 206 void Preferences::Init(PrefService* prefs) { | 209 void Preferences::Init(PrefService* prefs) { |
| 207 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); | 210 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); |
| 208 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); | 211 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); |
| 209 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); | 212 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); |
| 210 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this); | 213 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this); |
| 214 primary_mouse_button_right_.Init(prefs::kPrimaryMouseButtonRight, |
| 215 prefs, this); |
| 211 language_hotkey_next_engine_in_menu_.Init( | 216 language_hotkey_next_engine_in_menu_.Init( |
| 212 prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); | 217 prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); |
| 213 language_hotkey_previous_engine_.Init( | 218 language_hotkey_previous_engine_.Init( |
| 214 prefs::kLanguageHotkeyPreviousEngine, prefs, this); | 219 prefs::kLanguageHotkeyPreviousEngine, prefs, this); |
| 215 language_preferred_languages_.Init(prefs::kLanguagePreferredLanguages, | 220 language_preferred_languages_.Init(prefs::kLanguagePreferredLanguages, |
| 216 prefs, this); | 221 prefs, this); |
| 217 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); | 222 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); |
| 218 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { | 223 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
| 219 language_chewing_boolean_prefs_[i].Init( | 224 language_chewing_boolean_prefs_[i].Init( |
| 220 language_prefs::kChewingBooleanPrefs[i].pref_name, prefs, this); | 225 language_prefs::kChewingBooleanPrefs[i].pref_name, prefs, this); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 int sensitivity = sensitivity_.GetValue(); | 307 int sensitivity = sensitivity_.GetValue(); |
| 303 system::touchpad_settings::SetSensitivity(sensitivity); | 308 system::touchpad_settings::SetSensitivity(sensitivity); |
| 304 if (pref_name) { | 309 if (pref_name) { |
| 305 UMA_HISTOGRAM_CUSTOM_COUNTS( | 310 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 306 "Touchpad.Sensitivity.Changed", sensitivity, 1, 5, 5); | 311 "Touchpad.Sensitivity.Changed", sensitivity, 1, 5, 5); |
| 307 } else { | 312 } else { |
| 308 UMA_HISTOGRAM_CUSTOM_COUNTS( | 313 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 309 "Touchpad.Sensitivity.Started", sensitivity, 1, 5, 5); | 314 "Touchpad.Sensitivity.Started", sensitivity, 1, 5, 5); |
| 310 } | 315 } |
| 311 } | 316 } |
| 317 if (!pref_name || *pref_name == prefs::kPrimaryMouseButtonRight) { |
| 318 const bool right = primary_mouse_button_right_.GetValue(); |
| 319 system::mouse_settings::SetPrimaryButtonRight(right); |
| 320 if (pref_name) |
| 321 UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonLeft.Changed", right); |
| 322 else |
| 323 UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonLeft.Started", right); |
| 324 } |
| 312 | 325 |
| 313 // We don't handle prefs::kLanguageCurrentInputMethod and PreviousInputMethod | 326 // We don't handle prefs::kLanguageCurrentInputMethod and PreviousInputMethod |
| 314 // here. | 327 // here. |
| 315 | 328 |
| 316 if (!pref_name || *pref_name == prefs::kLanguageHotkeyNextEngineInMenu) { | 329 if (!pref_name || *pref_name == prefs::kLanguageHotkeyNextEngineInMenu) { |
| 317 SetLanguageConfigStringListAsCSV( | 330 SetLanguageConfigStringListAsCSV( |
| 318 language_prefs::kHotKeySectionName, | 331 language_prefs::kHotKeySectionName, |
| 319 language_prefs::kNextEngineInMenuConfigName, | 332 language_prefs::kNextEngineInMenuConfigName, |
| 320 language_hotkey_next_engine_in_menu_.GetValue()); | 333 language_hotkey_next_engine_in_menu_.GetValue()); |
| 321 } | 334 } |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 | 598 |
| 586 // Remove invalid prefs. | 599 // Remove invalid prefs. |
| 587 DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard); | 600 DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard); |
| 588 DictionaryValue* pref_value = updater.Get(); | 601 DictionaryValue* pref_value = updater.Get(); |
| 589 for (size_t i = 0; i < layouts_to_remove.size(); ++i) { | 602 for (size_t i = 0; i < layouts_to_remove.size(); ++i) { |
| 590 pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL); | 603 pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL); |
| 591 } | 604 } |
| 592 } | 605 } |
| 593 | 606 |
| 594 } // namespace chromeos | 607 } // namespace chromeos |
| OLD | NEW |