| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| index 06b809efdc0952913c30fd51f46556b476551a7e..9a602c310334e46fac3ab7eb06c5f212ae790ee3 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| @@ -67,29 +67,29 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
|
|
| // LoginDisplayHost implementation:
|
| virtual LoginDisplay* CreateLoginDisplay(
|
| - LoginDisplay::Delegate* delegate) OVERRIDE;
|
| - virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
|
| - virtual WebUILoginView* GetWebUILoginView() const OVERRIDE;
|
| - virtual void BeforeSessionStart() OVERRIDE;
|
| - virtual void Finalize() OVERRIDE;
|
| - virtual void OnCompleteLogin() OVERRIDE;
|
| - virtual void OpenProxySettings() OVERRIDE;
|
| - virtual void SetStatusAreaVisible(bool visible) OVERRIDE;
|
| - virtual AutoEnrollmentController* GetAutoEnrollmentController() OVERRIDE;
|
| + LoginDisplay::Delegate* delegate) override;
|
| + virtual gfx::NativeWindow GetNativeWindow() const override;
|
| + virtual WebUILoginView* GetWebUILoginView() const override;
|
| + virtual void BeforeSessionStart() override;
|
| + virtual void Finalize() override;
|
| + virtual void OnCompleteLogin() override;
|
| + virtual void OpenProxySettings() override;
|
| + virtual void SetStatusAreaVisible(bool visible) override;
|
| + virtual AutoEnrollmentController* GetAutoEnrollmentController() override;
|
| virtual void StartWizard(
|
| const std::string& first_screen_name,
|
| - scoped_ptr<base::DictionaryValue> screen_parameters) OVERRIDE;
|
| - virtual WizardController* GetWizardController() OVERRIDE;
|
| - virtual AppLaunchController* GetAppLaunchController() OVERRIDE;
|
| + scoped_ptr<base::DictionaryValue> screen_parameters) override;
|
| + virtual WizardController* GetWizardController() override;
|
| + virtual AppLaunchController* GetAppLaunchController() override;
|
| virtual void StartUserAdding(
|
| - const base::Closure& completion_callback) OVERRIDE;
|
| - virtual void StartSignInScreen(const LoginScreenContext& context) OVERRIDE;
|
| - virtual void ResumeSignInScreen() OVERRIDE;
|
| - virtual void OnPreferencesChanged() OVERRIDE;
|
| - virtual void PrewarmAuthentication() OVERRIDE;
|
| + const base::Closure& completion_callback) override;
|
| + virtual void StartSignInScreen(const LoginScreenContext& context) override;
|
| + virtual void ResumeSignInScreen() override;
|
| + virtual void OnPreferencesChanged() override;
|
| + virtual void PrewarmAuthentication() override;
|
| virtual void StartAppLaunch(const std::string& app_id,
|
| - bool diagnostic_mode) OVERRIDE;
|
| - virtual void StartDemoAppLaunch() OVERRIDE;
|
| + bool diagnostic_mode) override;
|
| + virtual void StartDemoAppLaunch() override;
|
|
|
| // Creates WizardController instance.
|
| WizardController* CreateWizardController();
|
| @@ -112,32 +112,32 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| // content::NotificationObserver implementation:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const content::NotificationDetails& details) override;
|
|
|
| // Overridden from content::WebContentsObserver:
|
| - virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
|
| + virtual void RenderProcessGone(base::TerminationStatus status) override;
|
|
|
| // Overridden from chromeos::SessionManagerClient::Observer:
|
| - virtual void EmitLoginPromptVisibleCalled() OVERRIDE;
|
| + virtual void EmitLoginPromptVisibleCalled() override;
|
|
|
| // Overridden from chromeos::CrasAudioHandler::AudioObserver:
|
| - virtual void OnActiveOutputNodeChanged() OVERRIDE;
|
| + virtual void OnActiveOutputNodeChanged() override;
|
|
|
| // Overridden from ash::KeyboardStateObserver:
|
| - virtual void OnVirtualKeyboardStateChanged(bool activated) OVERRIDE;
|
| + virtual void OnVirtualKeyboardStateChanged(bool activated) override;
|
|
|
| // Overridden from keyboard::KeyboardControllerObserver:
|
| - virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE;
|
| + virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
|
|
| // Overridden from gfx::DisplayObserver:
|
| - virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
|
| - virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
|
| + virtual void OnDisplayAdded(const gfx::Display& new_display) override;
|
| + virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
|
| virtual void OnDisplayMetricsChanged(const gfx::Display& display,
|
| - uint32_t changed_metrics) OVERRIDE;
|
| + uint32_t changed_metrics) override;
|
|
|
| // Overriden from views::WidgetRemovalsObserver:
|
| virtual void OnWillRemoveView(views::Widget* widget,
|
| - views::View* view) OVERRIDE;
|
| + views::View* view) override;
|
|
|
| private:
|
| // Way to restore if renderer have crashed.
|
|
|