| Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| index 2dba4828a1ae38ba2b3421cfa7d207b3f67d2435..281760b2921b4a8bb013856dd9ad1caa19827594 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
|
| @@ -90,31 +90,31 @@ class OobeUI : public OobeDisplay,
|
| virtual ~OobeUI();
|
|
|
| // OobeDisplay implementation:
|
| - virtual CoreOobeActor* GetCoreOobeActor() OVERRIDE;
|
| - virtual UpdateScreenActor* GetUpdateScreenActor() OVERRIDE;
|
| - virtual NetworkScreenActor* GetNetworkScreenActor() OVERRIDE;
|
| - virtual EulaScreenActor* GetEulaScreenActor() OVERRIDE;
|
| - virtual EnrollmentScreenActor* GetEnrollmentScreenActor() OVERRIDE;
|
| - virtual ResetScreenActor* GetResetScreenActor() OVERRIDE;
|
| - virtual KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() OVERRIDE;
|
| - virtual KioskEnableScreenActor* GetKioskEnableScreenActor() OVERRIDE;
|
| + virtual CoreOobeActor* GetCoreOobeActor() override;
|
| + virtual UpdateScreenActor* GetUpdateScreenActor() override;
|
| + virtual NetworkScreenActor* GetNetworkScreenActor() override;
|
| + virtual EulaScreenActor* GetEulaScreenActor() override;
|
| + virtual EnrollmentScreenActor* GetEnrollmentScreenActor() override;
|
| + virtual ResetScreenActor* GetResetScreenActor() override;
|
| + virtual KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() override;
|
| + virtual KioskEnableScreenActor* GetKioskEnableScreenActor() override;
|
| virtual TermsOfServiceScreenActor*
|
| - GetTermsOfServiceScreenActor() OVERRIDE;
|
| - virtual UserImageScreenActor* GetUserImageScreenActor() OVERRIDE;
|
| - virtual ErrorScreenActor* GetErrorScreenActor() OVERRIDE;
|
| - virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() OVERRIDE;
|
| + GetTermsOfServiceScreenActor() override;
|
| + virtual UserImageScreenActor* GetUserImageScreenActor() override;
|
| + virtual ErrorScreenActor* GetErrorScreenActor() override;
|
| + virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() override;
|
| virtual AutoEnrollmentCheckScreenActor*
|
| - GetAutoEnrollmentCheckScreenActor() OVERRIDE;
|
| + GetAutoEnrollmentCheckScreenActor() override;
|
| virtual SupervisedUserCreationScreenHandler*
|
| - GetSupervisedUserCreationScreenActor() OVERRIDE;
|
| + GetSupervisedUserCreationScreenActor() override;
|
| virtual AppLaunchSplashScreenActor*
|
| - GetAppLaunchSplashScreenActor() OVERRIDE;
|
| + GetAppLaunchSplashScreenActor() override;
|
| virtual bool IsJSReady(const base::Closure& display_is_ready_callback)
|
| - OVERRIDE;
|
| - virtual HIDDetectionScreenActor* GetHIDDetectionScreenActor() OVERRIDE;
|
| + override;
|
| + virtual HIDDetectionScreenActor* GetHIDDetectionScreenActor() override;
|
| virtual ControllerPairingScreenActor* GetControllerPairingScreenActor()
|
| - OVERRIDE;
|
| - virtual HostPairingScreenActor* GetHostPairingScreenActor() OVERRIDE;
|
| + override;
|
| + virtual HostPairingScreenActor* GetHostPairingScreenActor() override;
|
|
|
| // Collects localized strings from the owned handlers.
|
| void GetLocalizedStrings(base::DictionaryValue* localized_strings);
|
| @@ -165,7 +165,7 @@ class OobeUI : public OobeDisplay,
|
| void AddScreenHandler(BaseScreenHandler* handler);
|
|
|
| // CoreOobeHandler::Delegate implementation:
|
| - virtual void OnCurrentScreenChanged(const std::string& screen) OVERRIDE;
|
| + virtual void OnCurrentScreenChanged(const std::string& screen) override;
|
|
|
| // Type of UI.
|
| std::string display_type_;
|
|
|