Revert 128889 - Update IME preferences outside the IME status button when Uber Tray is in use.

chrome/browser/chromeos/preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/preferences.h"
 
-#include "ash/ash_switches.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ skipping 242 matching lines @@
                                    prefs, this);
   disable_gdata_hosted_files_.Init(prefs::kDisableGDataHostedFiles,
                                    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);
+                                     prefs, this);
   preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this);
-  current_input_method_.Init(prefs::kLanguageCurrentInputMethod, prefs, this);
-  previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, prefs, this);
-
   for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
     chewing_boolean_prefs_[i].Init(
         language_prefs::kChewingBooleanPrefs[i].pref_name, prefs, this);
   }
   for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) {
     chewing_multiple_choice_prefs_[i].Init(
         language_prefs::kChewingMultipleChoicePrefs[i].pref_name, prefs, this);
   }
   chewing_hsu_sel_key_type_.Init(
       language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this);
@@ skipping 135 matching lines @@
   if (!pref_name || ((*pref_name == prefs::kLanguageXkbAutoRepeatDelay) ||
                      (*pref_name == prefs::kLanguageXkbAutoRepeatInterval))) {
     UpdateAutoRepeatRate();
   }
 
   if (!pref_name || *pref_name == prefs::kLanguagePreloadEngines) {
     SetLanguageConfigStringListAsCSV(language_prefs::kGeneralSectionName,
                                      language_prefs::kPreloadEnginesConfigName,
                                      preload_engines_.GetValue());
   }
-
-  // Do not check |*pref_name| for the two prefs. We're only interested in
-  // initial values of the prefs.
-  // TODO(yusukes): Remove the second condition on R20.
-  if (!pref_name && !CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kDisableAshUberTray)) {
-    const std::string previous_input_method_id =
-        previous_input_method_.GetValue();
-    const std::string current_input_method_id =
-        current_input_method_.GetValue();
-    // NOTICE: ChangeInputMethod() has to be called AFTER the value of
-    // |preload_engines_| is sent to the InputMethodManager. Otherwise, the
-    // ChangeInputMethod request might be ignored as an invalid input method ID.
-    input_method::InputMethodManager* manager =
-        input_method::InputMethodManager::GetInstance();
-    if (!previous_input_method_id.empty())
-      manager->ChangeInputMethod(previous_input_method_id);
-    if (!current_input_method_id.empty())
-      manager->ChangeInputMethod(current_input_method_id);
-  }
-
   for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
     if (!pref_name ||
         *pref_name == language_prefs::kChewingBooleanPrefs[i].pref_name) {
       SetLanguageConfigBoolean(
           language_prefs::kChewingSectionName,
           language_prefs::kChewingBooleanPrefs[i].ibus_config_name,
           chewing_boolean_prefs_[i].GetValue());
     }
   }
   for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) {
@@ skipping 221 matching lines @@
 
   // Remove invalid prefs.
   DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
   DictionaryValue* pref_value = updater.Get();
   for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
     pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
   }
 }
 
 }  // namespace chromeos