| Index: ash/wm/ash_focus_rules.h
|
| diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h
|
| index b5774a2082fcc6d422cb52fbd359c7da3df0db83..e4198faba730d8c147ded9d0a034a7d939f87559 100644
|
| --- a/ash/wm/ash_focus_rules.h
|
| +++ b/ash/wm/ash_focus_rules.h
|
| @@ -20,12 +20,12 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules {
|
|
|
| private:
|
| // Overridden from ::wm::BaseFocusRules:
|
| - virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE;
|
| + virtual bool SupportsChildActivation(aura::Window* window) const override;
|
| virtual bool IsWindowConsideredVisibleForActivation(
|
| - aura::Window* window) const OVERRIDE;
|
| - virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
|
| + aura::Window* window) const override;
|
| + virtual bool CanActivateWindow(aura::Window* window) const override;
|
| virtual aura::Window* GetNextActivatableWindow(
|
| - aura::Window* ignore) const OVERRIDE;
|
| + aura::Window* ignore) const override;
|
|
|
| aura::Window* GetTopmostWindowToActivateForContainerIndex(
|
| int index,
|
|
|