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

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

Issue 1552743003: Add chrome.inputMethodPrivate.onImeMenuActivationChanged API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 288
289 registry->RegisterBooleanPref(prefs::kLangugaeImeMenuActivated, false); 289 registry->RegisterBooleanPref(prefs::kLanguageImeMenuActivated, false);
290 } 290 }
291 291
292 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { 292 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) {
293 prefs_ = prefs; 293 prefs_ = prefs;
294 294
295 BooleanPrefMember::NamedChangeCallback callback = 295 BooleanPrefMember::NamedChangeCallback callback =
296 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); 296 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this));
297 297
298 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, 298 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled,
299 prefs, callback); 299 prefs, callback);
(...skipping 12 matching lines...) Expand all
312 prefs, callback); 312 prefs, callback);
313 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled, 313 touch_hud_projection_enabled_.Init(prefs::kTouchHudProjectionEnabled,
314 prefs, callback); 314 prefs, callback);
315 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); 315 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback);
316 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes, 316 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes,
317 prefs, callback); 317 prefs, callback);
318 current_input_method_.Init(prefs::kLanguageCurrentInputMethod, 318 current_input_method_.Init(prefs::kLanguageCurrentInputMethod,
319 prefs, callback); 319 prefs, callback);
320 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, 320 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod,
321 prefs, callback); 321 prefs, callback);
322 ime_menu_activated_.Init(prefs::kLangugaeImeMenuActivated, prefs, callback); 322 ime_menu_activated_.Init(prefs::kLanguageImeMenuActivated, prefs, callback);
323 323
324 xkb_auto_repeat_enabled_.Init( 324 xkb_auto_repeat_enabled_.Init(
325 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); 325 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback);
326 xkb_auto_repeat_delay_pref_.Init( 326 xkb_auto_repeat_delay_pref_.Init(
327 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback); 327 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback);
328 xkb_auto_repeat_interval_pref_.Init( 328 xkb_auto_repeat_interval_pref_.Init(
329 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback); 329 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback);
330 330
331 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs, 331 wake_on_wifi_darkconnect_.Init(prefs::kWakeOnWifiDarkConnect, prefs,
332 callback); 332 callback);
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 std::string value(enabled_extension_imes_.GetValue()); 578 std::string value(enabled_extension_imes_.GetValue());
579 579
580 std::vector<std::string> split_values; 580 std::vector<std::string> split_values;
581 if (!value.empty()) { 581 if (!value.empty()) {
582 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE, 582 split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE,
583 base::SPLIT_WANT_ALL); 583 base::SPLIT_WANT_ALL);
584 } 584 }
585 ime_state_->SetEnabledExtensionImes(&split_values); 585 ime_state_->SetEnabledExtensionImes(&split_values);
586 } 586 }
587 587
588 if (pref_name == prefs::kLangugaeImeMenuActivated && 588 if (pref_name == prefs::kLanguageImeMenuActivated &&
589 (reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) { 589 (reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) {
590 const bool activated = ime_menu_activated_.GetValue(); 590 const bool activated = ime_menu_activated_.GetValue();
591 if (activated) 591 input_method::InputMethodManager::Get()->ImeMenuActivationChanged(
592 DVLOG(1) << "IME menu is activated."; 592 activated);
593 else
594 DVLOG(1) << "IME menu is deactivated.";
595 // TODO(azurewei): Fire inputMethodPrivate API event.
596 } 593 }
597 594
598 if (user_is_active) { 595 if (user_is_active) {
599 system::InputDeviceSettings::Get()->UpdateTouchpadSettings( 596 system::InputDeviceSettings::Get()->UpdateTouchpadSettings(
600 touchpad_settings); 597 touchpad_settings);
601 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings); 598 system::InputDeviceSettings::Get()->UpdateMouseSettings(mouse_settings);
602 } 599 }
603 600
604 if (user_is_primary_ && (reason != REASON_PREF_CHANGED || 601 if (user_is_primary_ && (reason != REASON_PREF_CHANGED ||
605 pref_name == prefs::kWakeOnWifiDarkConnect)) { 602 pref_name == prefs::kWakeOnWifiDarkConnect)) {
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 touch_hud_projection_enabled_.SetValue(enabled); 726 touch_hud_projection_enabled_.SetValue(enabled);
730 } 727 }
731 728
732 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { 729 void Preferences::ActiveUserChanged(const user_manager::User* active_user) {
733 if (active_user != user_) 730 if (active_user != user_)
734 return; 731 return;
735 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); 732 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, "");
736 } 733 }
737 734
738 } // namespace chromeos 735 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/mock_input_method_manager.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698