| Index: ui/aura/desktop/desktop_activation_client.h
|
| ===================================================================
|
| --- ui/aura/desktop/desktop_activation_client.h (revision 150582)
|
| +++ ui/aura/desktop/desktop_activation_client.h (working copy)
|
| @@ -39,7 +39,8 @@
|
| virtual void ActivateWindow(Window* window) OVERRIDE;
|
| virtual void DeactivateWindow(Window* window) OVERRIDE;
|
| virtual aura::Window* GetActiveWindow() OVERRIDE;
|
| - virtual bool OnWillFocusWindow(Window* window, const Event* event) OVERRIDE;
|
| + virtual bool OnWillFocusWindow(Window* window,
|
| + const ui::Event* event) OVERRIDE;
|
| virtual bool CanActivateWindow(Window* window) const OVERRIDE;
|
|
|
| // Overridden from aura::WindowObserver:
|
|
|