[oobe] Postpone localized content reload till WebUI is ready

chrome/browser/ui/webui/chromeos/login/network_screen_handler.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/ui/webui/chromeos/login/network_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 66 matching lines @@
 namespace chromeos {
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
 NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
     : BaseScreenHandler(kJsScreenPath),
       screen_(NULL),
       core_oobe_actor_(core_oobe_actor),
       is_continue_enabled_(false),
       show_on_init_(false),
+      should_reinitialize_language_keyboard_list_(false),
       weak_ptr_factory_(this) {
   DCHECK(core_oobe_actor_);
   SetupTimeouts();
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   manager->SetInputMethodLoginDefault();
   manager->GetComponentExtensionIMEManager()->AddObserver(this);
 }
 
@@ skipping 40 matching lines @@
 }
 
 void NetworkScreenHandler::ClearErrors() {
   if (page_is_ready())
     core_oobe_actor_->ClearErrors();
 }
 
 void NetworkScreenHandler::ShowConnectingStatus(
     bool connecting,
     const base::string16& network_id) {
-  // base::string16 connecting_label =
-  //     l10n_util::GetStringFUTF16(IDS_NETWORK_SELECTION_CONNECTING,
-  //                                network_id);
-  // CallJS("cr.ui.Oobe.showConnectingStatus",
-  //        base::FundamentalValue(connecting),
-  //        base::StringValue(network_id),
-  //        base::StringValue(connecting_label_value));
 }
 
 void NetworkScreenHandler::EnableContinue(bool enabled) {
   is_continue_enabled_ = enabled;
   if (page_is_ready())
     CallJS("enableContinueButton", enabled);
 }
 
 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------
 
@@ skipping 22 matching lines @@
   dict->Set("timezoneList", GetTimezoneList());
 }
 
 void NetworkScreenHandler::Initialize() {
   EnableContinue(is_continue_enabled_);
   if (show_on_init_) {
     show_on_init_ = false;
     Show();
   }
 
+  if (should_reinitialize_language_keyboard_list_) {
+    should_reinitialize_language_keyboard_list_ = false;
+    ReloadLocalizedContent();
+  }
+
   timezone_subscription_ = CrosSettings::Get()->AddSettingsObserver(
       kSystemTimezone,
       base::Bind(&NetworkScreenHandler::OnSystemTimezoneChanged,
                  base::Unretained(this)));
   OnSystemTimezoneChanged();
 }
 
 // NetworkScreenHandler, WebUIMessageHandler implementation: -------------------
 
 void NetworkScreenHandler::RegisterMessages() {
@@ skipping 35 matching lines @@
 // static
 void NetworkScreenHandler::OnLanguageChangedCallback(
     scoped_ptr<NetworkScreenHandlerOnLanguageChangedCallbackData> context,
     const std::string& /*requested locale*/,
     const std::string& /*loaded_locale*/,
     const bool /*success*/) {
   if (!context or !context->handler_)
     return;
 
   NetworkScreenHandler* const self = context->handler_.get();
-
-  base::DictionaryValue localized_strings;
-  static_cast<OobeUI*>(self->web_ui()->GetController())
-      ->GetLocalizedStrings(&localized_strings);
-  self->core_oobe_actor_->ReloadContent(localized_strings);
-
-  // Buttons are recreated, updated "Continue" button state.
-  self->EnableContinue(self->is_continue_enabled_);
+  self->ReloadLocalizedContent();
 
   AccessibilityManager::Get()->OnLocaleChanged();
 }
 
 void NetworkScreenHandler::HandleOnLanguageChanged(const std::string& locale) {
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   if (app_locale == locale)
     return;
 
   base::WeakPtr<NetworkScreenHandler> weak_self =
@@ skipping 172 matching lines @@
   input_method->SetString("title", util->GetInputMethodLongName(method));
   input_method->SetBoolean("selected", ime_id == current_input_method_id);
   return input_method.release();
 }
 
 void NetworkScreenHandler::OnImeComponentExtensionInitialized() {
   input_method::InputMethodManager::Get()->SetInputMethodLoginDefault();
 
   // Refreshes the language and keyboard list once the component extension
   // IMEs are initialized.
+  if (page_is_ready())
+    ReloadLocalizedContent();
+  else
+    should_reinitialize_language_keyboard_list_ = true;
+}
+
+void NetworkScreenHandler::ReloadLocalizedContent() {
   base::DictionaryValue localized_strings;
-  static_cast<OobeUI*>(this->web_ui()->GetController())
+  static_cast<OobeUI*>(web_ui()->GetController())
       ->GetLocalizedStrings(&localized_strings);
-  this->core_oobe_actor_->ReloadContent(localized_strings);
-  this->EnableContinue(this->is_continue_enabled_);
+  core_oobe_actor_->ReloadContent(localized_strings);
+
+  // Buttons are recreated, updated "Continue" button state.
+  EnableContinue(is_continue_enabled_);
 }
 
 // static
 base::ListValue* NetworkScreenHandler::GetInputMethods() {
   base::ListValue* input_methods_list = new base::ListValue;
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
   if (extension_ime_util::UseWrappedExtensionKeyboardLayouts()) {
     ComponentExtensionIMEManager* comp_manager =
@@ skipping 82 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos