ChromeOS: switch UI language before apps are loaded.

chrome/browser/chromeos/input_method/input_method_manager_impl.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_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include <sstream>
 
@@ skipping 404 matching lines @@
 
   if (descriptor->id() != current_input_method.id()) {
     previous_input_method = current_input_method;
     current_input_method = *descriptor;
     notify_menu = true;
   }
 
   // Always change input method even if it is the same.
   // TODO(komatsu): Revisit if this is neccessary.
   if (IsActive())
-    manager_->ChangeInputMethodInternal(*descriptor, show_message, notify_menu);
+    manager_->ChangeInputMethodInternal(*descriptor, profile, show_message,
+                                        notify_menu);
   manager_->RecordInputMethodUsage(current_input_method.id());
 }
 
 bool InputMethodManagerImpl::StateImpl::MethodAwaitsExtensionLoad(
     const std::string& input_method_id) const {
   // For 3rd party IME, when the user just logged in, SetEnabledExtensionImes
   // happens after activating the 3rd party IME.
   // So here to record the 3rd party IME to be activated, and activate it
   // when SetEnabledExtensionImes happens later.
   return !InputMethodIsActivated(input_method_id) &&
@@ skipping 382 matching lines @@
 
   if (state_.get() && state_->active_input_method_ids.size()) {
     // Initialize candidate window controller and widgets such as
     // candidate window, infolist and mode indicator.  Note, mode
     // indicator is used by only keyboard layout input methods.
     MaybeInitializeCandidateWindowController();
 
     // Always call ChangeInputMethodInternal even when the input method id
     // remain unchanged, because onActivate event needs to be sent to IME
     // extension to update the current screen type correctly.
-    ChangeInputMethodInternal(state_->current_input_method,
-                              false /* show_message */,
-                              true /* notify_menu */);
+    ChangeInputMethodInternal(state_->current_input_method, state_->profile,
+                              false /* show_message */, true /* notify_menu */);
   }
 }
 
 scoped_refptr<InputMethodManager::State>
 InputMethodManagerImpl::GetActiveIMEState() {
   return scoped_refptr<InputMethodManager::State>(state_.get());
 }
 
 InputMethodManagerImpl::InputMethodManagerImpl(
     scoped_ptr<InputMethodDelegate> delegate,
@@ skipping 127 matching lines @@
         util_.GetInputMethodDescriptorFromId(input_method_id_to_switch);
     if (!descriptor)
       LOG(ERROR) << "Unknown input method id: " << input_method_id_to_switch;
   }
   DCHECK(descriptor);
   return descriptor;
 }
 
 void InputMethodManagerImpl::ChangeInputMethodInternal(
     const InputMethodDescriptor& descriptor,
+    Profile* profile,
     bool show_message,
     bool notify_menu) {
   // No need to switch input method when terminating.
   if (ui_session_ == STATE_TERMINATING)
     return;
 
   if (candidate_window_controller_.get())
     candidate_window_controller_->Hide();
 
   if (notify_menu) {
@@ skipping 38 matching lines @@
   }
 
   // Change the keyboard layout to a preferred layout for the input method.
   if (!keyboard_->SetCurrentKeyboardLayoutByName(
           descriptor.GetPreferredKeyboardLayout())) {
     LOG(ERROR) << "Failed to change keyboard layout to "
                << descriptor.GetPreferredKeyboardLayout();
   }
 
   // Update input method indicators (e.g. "US", "DV") in Chrome windows.
-  FOR_EACH_OBSERVER(InputMethodManager::Observer,
-                    observers_,
-                    InputMethodChanged(this, show_message));
+  FOR_EACH_OBSERVER(InputMethodManager::Observer, observers_,
+                    InputMethodChanged(this, profile, show_message));
 }
 
 void InputMethodManagerImpl::LoadNecessaryComponentExtensions(
     InputMethodManagerImpl::StateImpl* state) {
   // Load component extensions but also update |active_input_method_ids| as
   // some component extension IMEs may have been removed from the Chrome OS
   // image. If specified component extension IME no longer exists, falling back
   // to an existing IME.
   DCHECK(state);
   std::vector<std::string> unfiltered_input_method_ids;
@@ skipping 113 matching lines @@
   if (candidate_window_controller_.get())
     return;
 
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   candidate_window_controller_->AddObserver(this);
 }
 
 }  // namespace input_method
 }  // namespace chromeos