ChromeOS: switch UI language before apps are loaded.

chrome/browser/chromeos/base/locale_util.cc

 // Copyright 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/base/locale_util.h"
 
 #include <vector>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
+#include "chrome/browser/chromeos/login/session/user_session_manager.h"
+#include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/platform_font_linux.h"
 
 namespace chromeos {
 
 namespace {
 
 struct SwitchLanguageData {
   SwitchLanguageData(const std::string& locale,
                      const bool enable_locale_keyboard_layouts,
                      const bool login_layouts_only,
-                     const locale_util::SwitchLanguageCallback& callback)
+                     const locale_util::SwitchLanguageCallback& callback,
+                     Profile* profile)
       : callback(callback),
         result(locale, std::string(), false),
         enable_locale_keyboard_layouts(enable_locale_keyboard_layouts),
-        login_layouts_only(login_layouts_only) {}
+        login_layouts_only(login_layouts_only),
+        profile(profile) {}
 
   const locale_util::SwitchLanguageCallback callback;
 
   locale_util::LanguageSwitchResult result;
   const bool enable_locale_keyboard_layouts;
   const bool login_layouts_only;
+  Profile* profile;
 };
 
 // Runs on SequencedWorkerPool thread under PostTaskAndReply().
 // So data is owned by "Reply" part of PostTaskAndReply() process.
 void SwitchLanguageDoReloadLocale(SwitchLanguageData* data) {
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   data->result.loaded_locale =
       ResourceBundle::GetSharedInstance().ReloadLocaleResources(
           data->result.requested_locale);
 
   data->result.success = !data->result.loaded_locale.empty();
 
   ResourceBundle::GetSharedInstance().ReloadFonts();
 }
 
 // Callback after SwitchLanguageDoReloadLocale() back in UI thread.
 void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (data->result.success) {
     g_browser_process->SetApplicationLocale(data->result.loaded_locale);
 
     if (data->enable_locale_keyboard_layouts) {
       input_method::InputMethodManager* manager =
           input_method::InputMethodManager::Get();
       scoped_refptr<input_method::InputMethodManager::State> ime_state =
-          manager->GetActiveIMEState();
+          UserSessionManager::GetInstance()->GetDefaultIMEState(data->profile);
+

[robliao, 2015/05/12 20:16:28]

Nit: Remove extra line.

[Alexander Alekseev, 2015/05/12 20:24:21]

Done.

       if (data->login_layouts_only) {
         // Enable the hardware keyboard layouts and locale-specific layouts
         // suitable for use on the login screen. This will also switch to the
         // first hardware keyboard layout since the input method currently in
         // use may not be supported by the new locale.
         ime_state->EnableLoginLayouts(
             data->result.loaded_locale,
             manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds());
       } else {
         // Enable all hardware keyboard layouts. This will also switch to the
@@ skipping 27 matching lines @@
                                            const std::string& loaded_locale,
                                            bool success)
     : requested_locale(requested_locale),
       loaded_locale(loaded_locale),
       success(success) {
 }
 
 void SwitchLanguage(const std::string& locale,
                     const bool enable_locale_keyboard_layouts,
                     const bool login_layouts_only,
-                    const SwitchLanguageCallback& callback) {
+                    const SwitchLanguageCallback& callback,
+                    Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  scoped_ptr<SwitchLanguageData> data(new SwitchLanguageData(
-      locale, enable_locale_keyboard_layouts, login_layouts_only, callback));
+  scoped_ptr<SwitchLanguageData> data(
+      new SwitchLanguageData(locale, enable_locale_keyboard_layouts,
+                             login_layouts_only, callback, profile));
   base::Closure reloader(
       base::Bind(&SwitchLanguageDoReloadLocale, base::Unretained(data.get())));
   content::BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       reloader,
       base::Bind(&FinishSwitchLanguage, base::Passed(data.Pass())));
 }
 
 }  // namespace locale_util
 }  // namespace chromeos