Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/autoclick/autoclick_controller.h" | 9 #include "ash/autoclick/autoclick_controller.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 278 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); | 278 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); |
| 279 | 279 |
| 280 registry->RegisterBooleanPref( | 280 registry->RegisterBooleanPref( |
| 281 prefs::kResolveTimezoneByGeolocation, true, | 281 prefs::kResolveTimezoneByGeolocation, true, |
| 282 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 282 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 283 | 283 |
| 284 registry->RegisterBooleanPref(prefs::kCaptivePortalAuthenticationIgnoresProxy, | 284 registry->RegisterBooleanPref(prefs::kCaptivePortalAuthenticationIgnoresProxy, |
| 285 true); | 285 true); |
| 286 | 286 |
| 287 registry->RegisterBooleanPref(prefs::kForceMaximizeOnFirstRun, false); | 287 registry->RegisterBooleanPref(prefs::kForceMaximizeOnFirstRun, false); |
| 288 | |
| 289 registry->RegisterBooleanPref(prefs::kLangugaeImeMenuFlagEnabled, | |
|
michaelpg
2016/01/04 16:37:36
why is the flag also preference? do any other flag
Azure Wei
2016/01/05 06:48:03
This preference was used in language_options.js, i
| |
| 290 chromeos::switches::ImeMenuEnabled()); | |
| 291 | |
| 292 registry->RegisterBooleanPref(prefs::kLangugaeImeMenuActivated, false); | |
| 288 } | 293 } |
| 289 | 294 |
| 290 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { | 295 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { |
| 291 prefs_ = prefs; | 296 prefs_ = prefs; |
| 292 | 297 |
| 293 BooleanPrefMember::NamedChangeCallback callback = | 298 BooleanPrefMember::NamedChangeCallback callback = |
| 294 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); | 299 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); |
| 295 | 300 |
| 296 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, | 301 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, |
| 297 prefs, callback); | 302 prefs, callback); |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 310 prefs, callback); | 315 prefs, callback); |
| 311 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled, | 316 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled, |
| 312 prefs, callback); | 317 prefs, callback); |
| 313 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); | 318 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); |
| 314 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes, | 319 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes, |
| 315 prefs, callback); | 320 prefs, callback); |
| 316 current_input_method_.Init(prefs::kLanguageCurrentInputMethod, | 321 current_input_method_.Init(prefs::kLanguageCurrentInputMethod, |
| 317 prefs, callback); | 322 prefs, callback); |
| 318 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, | 323 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, |
| 319 prefs, callback); | 324 prefs, callback); |
| 325 ime_menu_activated_.Init(prefs::kLangugaeImeMenuActivated, prefs, callback); | |
| 320 | 326 |
| 321 xkb_auto_repeat_enabled_.Init( | 327 xkb_auto_repeat_enabled_.Init( |
| 322 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); | 328 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); |
| 323 xkb_auto_repeat_delay_pref_.Init( | 329 xkb_auto_repeat_delay_pref_.Init( |
| 324 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback); | 330 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback); |
| 325 xkb_auto_repeat_interval_pref_.Init( | 331 xkb_auto_repeat_interval_pref_.Init( |
| 326 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback); | 332 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback); |
| 327 | 333 |
| 328 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs, | 334 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs, |
| 329 callback); | 335 callback); |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 575 std::string value(enabled_extension_imes_.GetValue()); | 581 std::string value(enabled_extension_imes_.GetValue()); |
| 576 | 582 |
| 577 std::vector<std::string> split_values; | 583 std::vector<std::string> split_values; |
| 578 if (!value.empty()) { | 584 if (!value.empty()) { |
| 579 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, | 585 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, |
| 580 base::SPLIT_WANT_ALL); | 586 base::SPLIT_WANT_ALL); |
| 581 } | 587 } |
| 582 ime_state_->SetEnabledExtensionImes(&split_values); | 588 ime_state_->SetEnabledExtensionImes(&split_values); |
| 583 } | 589 } |
| 584 | 590 |
| 591 if (pref_name == prefs::kLangugaeImeMenuActivated && | |
| 592 (reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) { | |
| 593 const bool activated = ime_menu_activated_.GetValue(); | |
| 594 if (activated) | |
| 595 DVLOG(1) << "IME menu is activated."; | |
| 596 else | |
| 597 DVLOG(1) << "IME menu is deactivated."; | |
| 598 // TODO(azurewei): Fire inputMethodPrivate API event. | |
| 599 } | |
| 600 | |
| 585 if (user_is_active) { | 601 if (user_is_active) { |
| 586 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( | 602 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( |
| 587 touchpad_settings); | 603 touchpad_settings); |
| 588 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); | 604 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); |
| 589 } | 605 } |
| 590 | 606 |
| 591 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || | 607 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || |
| 592 pref_name == prefs::kWakeOnWifiDarkConnect)) { | 608 pref_name == prefs::kWakeOnWifiDarkConnect)) { |
| 593 int features = wake_on_wifi_darkconnect_.GetValue() | 609 int features = wake_on_wifi_darkconnect_.GetValue() |
| 594 ? WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT | 610 ? WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 716 touch_hud_projection_enabled_.SetValue(enabled); | 732 touch_hud_projection_enabled_.SetValue(enabled); |
| 717 } | 733 } |
| 718 | 734 |
| 719 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 735 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
| 720 if (active_user != user_) | 736 if (active_user != user_) |
| 721 return; | 737 return; |
| 722 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 738 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
| 723 } | 739 } |
| 724 | 740 |
| 725 } // namespace chromeos | 741 } // namespace chromeos |
| OLD | NEW |