Index: chrome/browser/chromeos/preferences.cc |
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc |
index 19f9a7a5e2831f9818705dbf6f62c7824a312998..5fb91617fec12f9f1879a4b96842ff06f13cc0f6 100644 |
--- a/chrome/browser/chromeos/preferences.cc |
+++ b/chrome/browser/chromeos/preferences.cc |
@@ -286,7 +286,7 @@ void Preferences::RegisterProfilePrefs( |
registry->RegisterBooleanPref(prefs::kForceMaximizeOnFirstRun, false); |
- registry->RegisterBooleanPref(prefs::kLangugaeImeMenuActivated, false); |
+ registry->RegisterBooleanPref(prefs::kLanguageImeMenuActivated, false); |
} |
void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { |
@@ -319,7 +319,7 @@ void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { |
prefs, callback); |
previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, |
prefs, callback); |
- ime_menu_activated_.Init(prefs::kLangugaeImeMenuActivated, prefs, callback); |
+ ime_menu_activated_.Init(prefs::kLanguageImeMenuActivated, prefs, callback); |
xkb_auto_repeat_enabled_.Init( |
prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); |
@@ -585,14 +585,11 @@ void Preferences::ApplyPreferences(ApplyReason reason, |
ime_state_->SetEnabledExtensionImes(&split_values); |
} |
- if (pref_name == prefs::kLangugaeImeMenuActivated && |
+ if (pref_name == prefs::kLanguageImeMenuActivated && |
(reason == REASON_PREF_CHANGED || reason == REASON_ACTIVE_USER_CHANGED)) { |
const bool activated = ime_menu_activated_.GetValue(); |
- if (activated) |
- DVLOG(1) << "IME menu is activated."; |
- else |
- DVLOG(1) << "IME menu is deactivated."; |
- // TODO(azurewei): Fire inputMethodPrivate API event. |
+ input_method::InputMethodManager::Get()->ImeMenuActivationChanged( |
+ activated); |
} |
if (user_is_active) { |