Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / login / host_pairing_screen_handler.h

diff --git a/src/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h b/src/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h
index f1455f7..f01271a 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h
+++ b/src/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h
@@ -7,8 +7,8 @@
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/screen_context.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
+#include "components/login/screens/screen_context.h"
 
 namespace chromeos {
 
@@ -22,24 +22,24 @@ class HostPairingScreenHandler : public HostPairingScreenActor,
   void HandleContextReady();
 
   // Overridden from BaseScreenHandler:
-  virtual void Initialize() OVERRIDE;
-  virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) OVERRIDE;
+  virtual void Initialize() override;
+  virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) override;
 
   // Overridden from content::WebUIMessageHandler:
-  virtual void RegisterMessages() OVERRIDE;
+  virtual void RegisterMessages() override;
 
   // Overridden from HostPairingScreenActor:
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void SetDelegate(Delegate* delegate) OVERRIDE;
-  virtual void OnContextChanged(const base::DictionaryValue& diff) OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void SetDelegate(Delegate* delegate) override;
+  virtual void OnContextChanged(const base::DictionaryValue& diff) override;
 
   HostPairingScreenActor::Delegate* delegate_;
   bool show_on_init_;
   bool js_context_ready_;
 
   // Caches context changes while JS part is not ready to receive messages.
-  ScreenContext context_cache_;
+  ::login::ScreenContext context_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(HostPairingScreenHandler);
 };