| Index: ui/wm/core/default_activation_client.h
|
| diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h
|
| index 13b2474ee27523991f14d4b48498fb842445764d..fb9f9e2f3690f2af9ef633a926dd55a7a1801902 100644
|
| --- a/ui/wm/core/default_activation_client.h
|
| +++ b/ui/wm/core/default_activation_client.h
|
| @@ -33,18 +33,18 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient,
|
|
|
| // Overridden from aura::client::ActivationClient:
|
| virtual void AddObserver(
|
| - aura::client::ActivationChangeObserver* observer) OVERRIDE;
|
| + aura::client::ActivationChangeObserver* observer) override;
|
| virtual void RemoveObserver(
|
| - aura::client::ActivationChangeObserver* observer) OVERRIDE;
|
| - virtual void ActivateWindow(aura::Window* window) OVERRIDE;
|
| - virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
|
| - virtual aura::Window* GetActiveWindow() OVERRIDE;
|
| - virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
|
| - virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE;
|
| - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
|
| + aura::client::ActivationChangeObserver* observer) override;
|
| + virtual void ActivateWindow(aura::Window* window) override;
|
| + virtual void DeactivateWindow(aura::Window* window) override;
|
| + virtual aura::Window* GetActiveWindow() override;
|
| + virtual aura::Window* GetActivatableWindow(aura::Window* window) override;
|
| + virtual aura::Window* GetToplevelWindow(aura::Window* window) override;
|
| + virtual bool CanActivateWindow(aura::Window* window) const override;
|
|
|
| // Overridden from WindowObserver:
|
| - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
|
| + virtual void OnWindowDestroyed(aura::Window* window) override;
|
|
|
| private:
|
| class Deleter;
|
|
|