diff options
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.h | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/preferences.cc | 23 | ||||
| -rw-r--r-- | chrome/browser/chromeos/preferences.h | 2 |
4 files changed, 0 insertions, 34 deletions
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc index 0b3724e..d7618b1 100644 --- a/chrome/browser/chromeos/language_preferences.cc +++ b/chrome/browser/chromeos/language_preferences.cc @@ -16,11 +16,6 @@ namespace language_prefs { const char kGeneralSectionName[] = "general"; const char kHotKeySectionName[] = "general/hotkey"; const char kPreloadEnginesConfigName[] = "preload_engines"; -const char kNextEngineInMenuConfigName[] = "next_engine_in_menu"; -const char kPreviousEngineConfigName[] = "previous_engine"; -// The following two variables are for deleting ibus-daemon's default hotkeys. -const char kHotkeyNextEngineInMenu[] = ""; -const char kHotkeyPreviousEngine[] = ""; // --------------------------------------------------------------------------- // For Traditional Chinese input method (ibus-mozc-chewing) diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index 289a549..258ca30 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.h @@ -68,10 +68,6 @@ struct LanguageIntegerRangePreference { extern const char kGeneralSectionName[]; extern const char kHotKeySectionName[]; extern const char kPreloadEnginesConfigName[]; -extern const char kNextEngineInMenuConfigName[]; -extern const char kPreviousEngineConfigName[]; -extern const char kHotkeyNextEngineInMenu[]; -extern const char kHotkeyPreviousEngine[]; // --------------------------------------------------------------------------- // For Traditional Chinese input method (ibus-mozc-chewing) diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 4574db4..f4bfd45 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -134,13 +134,6 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, "", PrefService::UNSYNCABLE_PREF); - // We don't sync input method hotkeys since they're not configurable. - prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, - language_prefs::kHotkeyNextEngineInMenu, - PrefService::UNSYNCABLE_PREF); - prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, - language_prefs::kHotkeyPreviousEngine, - PrefService::UNSYNCABLE_PREF); // We don't sync the list of input methods and preferred languages since a // user might use two or more devices with different hardware keyboards. // crosbug.com/15181 @@ -278,10 +271,6 @@ void Preferences::InitUserPrefs(PrefService* prefs) { prefs, this); primary_mouse_button_right_.Init(prefs::kPrimaryMouseButtonRight, prefs, this); - hotkey_next_engine_in_menu_.Init( - prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); - hotkey_previous_engine_.Init( - prefs::kLanguageHotkeyPreviousEngine, prefs, this); preferred_languages_.Init(prefs::kLanguagePreferredLanguages, prefs, this); preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); @@ -422,18 +411,6 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonRight.Started", right); } - if (!pref_name || *pref_name == prefs::kLanguageHotkeyNextEngineInMenu) { - SetLanguageConfigStringListAsCSV( - language_prefs::kHotKeySectionName, - language_prefs::kNextEngineInMenuConfigName, - hotkey_next_engine_in_menu_.GetValue()); - } - if (!pref_name || *pref_name == prefs::kLanguageHotkeyPreviousEngine) { - SetLanguageConfigStringListAsCSV( - language_prefs::kHotKeySectionName, - language_prefs::kPreviousEngineConfigName, - hotkey_previous_engine_.GetValue()); - } if (!pref_name || *pref_name == prefs::kLanguagePreferredLanguages) { // Unlike kLanguagePreloadEngines and some other input method // preferencs, we don't need to send this to ibus-daemon. diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h index 57d58dc4..7be9c3e 100644 --- a/chrome/browser/chromeos/preferences.h +++ b/chrome/browser/chromeos/preferences.h @@ -117,8 +117,6 @@ class Preferences : public content::NotificationObserver { BooleanPrefMember disable_gdata_hosted_files_; // Input method preferences. - StringPrefMember hotkey_next_engine_in_menu_; - StringPrefMember hotkey_previous_engine_; StringPrefMember preferred_languages_; StringPrefMember preload_engines_; StringPrefMember current_input_method_; |