Chromium Code Reviews| Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.h |
| diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h |
| index 344f0fcda9d7521db63c5e78ca6de56e159ae67c..69d33b805cc10f4f0ef1f046b2c170a3ff850c04 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h |
| +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h |
| @@ -13,6 +13,7 @@ |
| #include "chrome/browser/chromeos/login/screens/network_screen_actor.h" |
| #include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" |
| +#include "chromeos/ime/component_extension_ime_manager.h" |
| #include "ui/gfx/point.h" |
| class PrefRegistrySimple; |
| @@ -27,7 +28,8 @@ struct NetworkScreenHandlerOnLanguageChangedCallbackData; |
| // WebUI implementation of NetworkScreenActor. It is used to interact with |
| // the welcome screen (part of the page) of the OOBE. |
| class NetworkScreenHandler : public NetworkScreenActor, |
| - public BaseScreenHandler { |
| + public BaseScreenHandler, |
| + public ComponentExtensionIMEManager::Observer { |
| public: |
| explicit NetworkScreenHandler(CoreOobeActor* core_oobe_actor); |
| virtual ~NetworkScreenHandler(); |
| @@ -51,6 +53,9 @@ class NetworkScreenHandler : public NetworkScreenActor, |
| // WebUIMessageHandler implementation: |
| virtual void RegisterMessages() OVERRIDE; |
| + // ComponentExtensionIMEManager::Observer implementation: |
| + virtual void OnInitialized() OVERRIDE; |
| + |
| // Registers the preference for derelict state. |
| static void RegisterPrefs(PrefRegistrySimple* registry); |
| @@ -58,9 +63,15 @@ class NetworkScreenHandler : public NetworkScreenActor, |
| // Handles moving off the screen. |
| void HandleOnExit(); |
| - // Handles change of the language. |
| + // Handles change of the language, if the given locale is the same as current |
| + // locale, it won't refresh the UI. |
| void HandleOnLanguageChanged(const std::string& locale); |
| + // Handles change of the language, the parameter force_refresh can control |
|
Yuki
2014/03/07 07:47:04
nit: s/force_refresh/|force_refresh|/
We use |code
Shu Chen
2014/03/07 08:24:09
Done. I've removed this.
|
| + // whether to forcibly refresh the UI. |
| + void HandleOnLanguageChangedInternal(const std::string& locale, |
| + bool force_refresh); |
| + |
| // Async callback after ReloadResourceBundle(locale) completed. |
| static void OnLanguageChangedCallback( |
| scoped_ptr<NetworkScreenHandlerOnLanguageChangedCallbackData> context, |