| Index: chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| index c419dcf6a74049153349272a6aa9866d807feaa8..11c474d0cf329c22a464d5f5b879ac638b5cd978 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| +++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| @@ -31,22 +31,22 @@ class ErrorScreenHandler : public BaseScreenHandler,
|
| virtual ~ErrorScreenHandler();
|
|
|
| // ErrorScreenActor implementation:
|
| - virtual void SetDelegate(ErrorScreenActorDelegate* delegate) OVERRIDE;
|
| + virtual void SetDelegate(ErrorScreenActorDelegate* delegate) override;
|
| virtual void Show(OobeDisplay::Screen parent_screen,
|
| - base::DictionaryValue* params) OVERRIDE;
|
| + base::DictionaryValue* params) override;
|
| virtual void Show(OobeDisplay::Screen parent_screen,
|
| base::DictionaryValue* params,
|
| - const base::Closure& on_hide) OVERRIDE;
|
| - virtual void Hide() OVERRIDE;
|
| - virtual void FixCaptivePortal() OVERRIDE;
|
| - virtual void ShowCaptivePortal() OVERRIDE;
|
| - virtual void HideCaptivePortal() OVERRIDE;
|
| - virtual void SetUIState(ErrorScreen::UIState ui_state) OVERRIDE;
|
| + const base::Closure& on_hide) override;
|
| + virtual void Hide() override;
|
| + virtual void FixCaptivePortal() override;
|
| + virtual void ShowCaptivePortal() override;
|
| + virtual void HideCaptivePortal() override;
|
| + virtual void SetUIState(ErrorScreen::UIState ui_state) override;
|
| virtual void SetErrorState(ErrorScreen::ErrorState error_state,
|
| - const std::string& network) OVERRIDE;
|
| - virtual void AllowGuestSignin(bool allowed) OVERRIDE;
|
| - virtual void AllowOfflineLogin(bool allowed) OVERRIDE;
|
| - virtual void ShowConnectingIndicator(bool show) OVERRIDE;
|
| + const std::string& network) override;
|
| + virtual void AllowGuestSignin(bool allowed) override;
|
| + virtual void AllowOfflineLogin(bool allowed) override;
|
| + virtual void ShowConnectingIndicator(bool show) override;
|
|
|
| private:
|
| // Sends notification that error message is shown.
|
| @@ -67,11 +67,11 @@ class ErrorScreenHandler : public BaseScreenHandler,
|
| void HandleLaunchOobeGuestSession();
|
|
|
| // WebUIMessageHandler implementation:
|
| - virtual void RegisterMessages() OVERRIDE;
|
| + virtual void RegisterMessages() override;
|
|
|
| // BaseScreenHandler implementation:
|
| - virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) OVERRIDE;
|
| - virtual void Initialize() OVERRIDE;
|
| + virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) override;
|
| + virtual void Initialize() override;
|
|
|
| // Non-owning ptr.
|
| ErrorScreenActorDelegate* delegate_;
|
|
|