ChromeOS: switch UI language before apps are loaded.

chrome/browser/chromeos/input_method/input_method_persistence.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/input_method/input_method_persistence.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sys_info.h"
@@ skipping 65 matching lines @@
   if (profile == NULL)
     return;
 
   PrefService* const local_state = g_browser_process->local_state();
 
   SetUserLRUInputMethodPreference(
       profile->GetProfileUserName(), input_method, local_state);
 }
 
 void PersistUserInputMethod(const std::string& input_method,
-                            InputMethodManager* const manager) {
+                            InputMethodManager* const manager,
+                            Profile* profile) {
   PrefService* user_prefs = NULL;
   // Persist the method on a per user basis. Note that the keyboard settings are
   // stored per user desktop and a visiting window will use the same input
   // method as the desktop it is on (and not of the owner of the window).
-  Profile* profile = ProfileManager::GetActiveUserProfile();
   if (profile)
     user_prefs = profile->GetPrefs();
   if (!user_prefs)
     return;
   SetUserLRUInputMethod(input_method, manager, profile);
 
   const std::string current_input_method_on_pref =
       user_prefs->GetString(prefs::kLanguageCurrentInputMethod);
   if (current_input_method_on_pref == input_method)
     return;
@@ skipping 10 matching lines @@
     InputMethodManager* input_method_manager)
     : input_method_manager_(input_method_manager),
       ui_session_(InputMethodManager::STATE_LOGIN_SCREEN) {
   input_method_manager_->AddObserver(this);
 }
 
 InputMethodPersistence::~InputMethodPersistence() {
   input_method_manager_->RemoveObserver(this);
 }
 
-void InputMethodPersistence::InputMethodChanged(
-    InputMethodManager* manager, bool show_message) {
+void InputMethodPersistence::InputMethodChanged(InputMethodManager* manager,
+                                                Profile* profile,
+                                                bool show_message) {
   DCHECK_EQ(input_method_manager_, manager);
   const std::string current_input_method =
       manager->GetActiveIMEState()->GetCurrentInputMethod().id();
   // Save the new input method id depending on the current browser state.
   switch (ui_session_) {
     case InputMethodManager::STATE_LOGIN_SCREEN:
       if (!manager->IsLoginKeyboard(current_input_method)) {
         DVLOG(1) << "Only keyboard layouts are supported: "
                  << current_input_method;
         return;
       }
       PersistSystemInputMethod(current_input_method);
       return;
     case InputMethodManager::STATE_BROWSER_SCREEN:
-      PersistUserInputMethod(current_input_method, manager);
+      PersistUserInputMethod(current_input_method, manager, profile);
       return;
     case InputMethodManager::STATE_LOCK_SCREEN:
       // We use a special set of input methods on the screen. Do not update.
       return;
     case InputMethodManager::STATE_TERMINATING:
       return;
   }
   NOTREACHED();
 }
 
 void InputMethodPersistence::OnSessionStateChange(
     InputMethodManager::UISessionState new_ui_session) {
   ui_session_ = new_ui_session;
 }
 
 void SetUserLRUInputMethodPreferenceForTesting(const std::string& username,
                                                const std::string& input_method,
                                                PrefService* const local_state) {
   SetUserLRUInputMethodPreference(username, input_method, local_state);
 }
 
 }  // namespace input_method
 }  // namespace chromeos