Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 1523593002: Add an option in language settings for activating the IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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::kLangugaeActivateImeMenu, false);
Shu Chen 2015/12/28 16:41:47 pls put this behind a flag.
Azure Wei 2016/01/04 06:30:38 Added a new flag 'enable-ime-menu'.
288 } 290 }
289 291
290 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { 292 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) {
291 prefs_ = prefs; 293 prefs_ = prefs;
292 294
293 BooleanPrefMember::NamedChangeCallback callback = 295 BooleanPrefMember::NamedChangeCallback callback =
294 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); 296 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this));
295 297
296 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, 298 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled,
297 prefs, callback); 299 prefs, callback);
(...skipping 12 matching lines...) Expand all
310 prefs, callback); 312 prefs, callback);
311 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled, 313 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled,
312 prefs, callback); 314 prefs, callback);
313 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); 315 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback);
314 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes, 316 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes,
315 prefs, callback); 317 prefs, callback);
316 current_input_method_.Init(prefs::kLanguageCurrentInputMethod, 318 current_input_method_.Init(prefs::kLanguageCurrentInputMethod,
317 prefs, callback); 319 prefs, callback);
318 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, 320 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod,
319 prefs, callback); 321 prefs, callback);
322 ime_menu_activated_.Init(prefs::kLangugaeActivateImeMenu, prefs, callback);
320 323
321 xkb_auto_repeat_enabled_.Init( 324 xkb_auto_repeat_enabled_.Init(
322 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); 325 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback);
323 xkb_auto_repeat_delay_pref_.Init( 326 xkb_auto_repeat_delay_pref_.Init(
324 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback); 327 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback);
325 xkb_auto_repeat_interval_pref_.Init( 328 xkb_auto_repeat_interval_pref_.Init(
326 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback); 329 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback);
327 330
328 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs, 331 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs,
329 callback); 332 callback);
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 std::string value(enabled_extension_imes_.GetValue()); 578 std::string value(enabled_extension_imes_.GetValue());
576 579
577 std::vector<std::string> split_values; 580 std::vector<std::string> split_values;
578 if (!value.empty()) { 581 if (!value.empty()) {
579 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, 582 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE,
580 base::SPLIT_WANT_ALL); 583 base::SPLIT_WANT_ALL);
581 } 584 }
582 ime_state_->SetEnabledExtensionImes(&split_values); 585 ime_state_->SetEnabledExtensionImes(&split_values);
583 } 586 }
584 587
588 if (pref_name == prefs::kLangugaeActivateImeMenu &&
589 reason == REASON_PREF_CHANGED) {
590 const bool activated = ime_menu_activated_.GetValue();
591 if (activated) {
592 input_method_manager_->ImeMenuActivated();
593 } else {
594 input_method_manager_->ImeMenuDeactivated();
595 }
596 }
597
585 if (user_is_active) { 598 if (user_is_active) {
586 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( 599 system::InputDeviceSettings::Get()->UpdateTouchpadSettings(
587 touchpad_settings); 600 touchpad_settings);
588 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); 601 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings);
589 } 602 }
590 603
591 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || 604 if (user_is_primary_ && (reason != REASON_PREF_CHANGED ||
592 pref_name == prefs::kWakeOnWifiDarkConnect)) { 605 pref_name == prefs::kWakeOnWifiDarkConnect)) {
593 int features = wake_on_wifi_darkconnect_.GetValue() 606 int features = wake_on_wifi_darkconnect_.GetValue()
594 ? WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT 607 ? WakeOnWifiManager::WAKE_ON_WIFI_DARKCONNECT
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 touch_hud_projection_enabled_.SetValue(enabled); 729 touch_hud_projection_enabled_.SetValue(enabled);
717 } 730 }
718 731
719 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { 732 void Preferences::ActiveUserChanged(const user_manager::User* active_user) {
720 if (active_user != user_) 733 if (active_user != user_)
721 return; 734 return;
722 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); 735 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, "");
723 } 736 }
724 737
725 } // namespace chromeos 738 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698