| Index: ash/wm/activation_controller.h
|
| diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
|
| index df19a52ae8eb973d1be759d7ed774a61f18eef52..94943453b0c5f1918a3b99d03da4e7d35344aead 100644
|
| --- a/ash/wm/activation_controller.h
|
| +++ b/ash/wm/activation_controller.h
|
| @@ -40,6 +40,7 @@ class ASH_EXPORT ActivationController
|
| virtual aura::Window* GetActiveWindow() OVERRIDE;
|
| virtual bool OnWillFocusWindow(aura::Window* window,
|
| const aura::Event* event) OVERRIDE;
|
| + virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
|
|
|
| // Overridden from aura::WindowObserver:
|
| virtual void OnWindowVisibilityChanged(aura::Window* window,
|
|
|