IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 441 matching lines @@
 
   Profile* profile;
 };
 
 // static
 void GuestLanguageSetCallbackData::Callback(
     const scoped_ptr<GuestLanguageSetCallbackData>& self,
     const std::string& locale,
     const std::string& loaded_locale,
     bool success) {
-  input_method::InputMethodManager* const ime_manager =
+  input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
+  scoped_refptr<input_method::InputMethodManager::State> ime_state =
+      manager->GetActiveIMEState();
   // Active layout must be hardware "login layout".
   // The previous one must be "locale default layout".
   // First, enable all hardware input methods.
   const std::vector<std::string>& input_methods =
-      ime_manager->GetInputMethodUtil()->GetHardwareInputMethodIds();
+      manager->GetInputMethodUtil()->GetHardwareInputMethodIds();
   for (size_t i = 0; i < input_methods.size(); ++i)
-    ime_manager->EnableInputMethod(input_methods[i]);
+    ime_state->EnableInputMethod(input_methods[i]);
 
   // Second, enable locale based input methods.
   const std::string locale_default_input_method =
-      ime_manager->GetInputMethodUtil()->
-          GetLanguageDefaultInputMethodId(loaded_locale);
+      manager->GetInputMethodUtil()->GetLanguageDefaultInputMethodId(
+          loaded_locale);
   if (!locale_default_input_method.empty()) {
     PrefService* user_prefs = self->profile->GetPrefs();
     user_prefs->SetString(prefs::kLanguagePreviousInputMethod,
                           locale_default_input_method);
-    ime_manager->EnableInputMethod(locale_default_input_method);
+    ime_state->EnableInputMethod(locale_default_input_method);
   }
 
   // Finally, activate the first login input method.
   const std::vector<std::string>& login_input_methods =
-      ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
-  ime_manager->ChangeInputMethod(login_input_methods[0]);
+      manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
+  ime_state->ChangeInputMethod(login_input_methods[0],
+                               false /* show_message */);
 }
 
 void SetGuestLocale(Profile* const profile) {
   scoped_ptr<GuestLanguageSetCallbackData> data(
       new GuestLanguageSetCallbackData(profile));
   scoped_ptr<locale_util::SwitchLanguageCallback> callback(
       new locale_util::SwitchLanguageCallback(base::Bind(
           &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass()))));
   user_manager::User* const user =
       ProfileHelper::Get()->GetUserByProfile(profile);
@@ skipping 20 matching lines @@
     bool is_official_build = true;
 #else
     bool is_official_build = false;
 #endif
     // Enable portal detector if EULA was previously accepted or if
     // this is an unofficial build.
     if (!is_official_build || StartupUtils::IsEulaAccepted())
       detector->Enable(true);
   }
 
+  // Initialize input methods.
+  input_method::InputMethodManager* manager =
+      input_method::InputMethodManager::Get();
+  UserSessionManager* session_manager = UserSessionManager::GetInstance();
+  DCHECK(manager);
+  DCHECK(session_manager);
+
+  manager->SetState(session_manager->GetDefaultIMEState(profile()));
+
   bool is_running_test = parameters().ui_task != NULL;
   g_browser_process->platform_part()->InitializeSessionManager(
       parsed_command_line(), profile(), is_running_test);
   g_browser_process->platform_part()->SessionManager()->Start();
 
   // Guest user profile is never initialized with locale settings,
   // so we need special handling for Guest session.
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
     SetGuestLocale(profile());
 
@@ skipping 197 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos