diff options
Diffstat (limited to 'ui/aura/desktop')
-rw-r--r-- | ui/aura/desktop/desktop_activation_client.cc | 2 | ||||
-rw-r--r-- | ui/aura/desktop/desktop_activation_client.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/aura/desktop/desktop_activation_client.cc b/ui/aura/desktop/desktop_activation_client.cc index d948203..497d56e 100644 --- a/ui/aura/desktop/desktop_activation_client.cc +++ b/ui/aura/desktop/desktop_activation_client.cc @@ -97,7 +97,7 @@ Window* DesktopActivationClient::GetActiveWindow() { } bool DesktopActivationClient::OnWillFocusWindow(Window* window, - const Event* event) { + const ui::Event* event) { return CanActivateWindow(GetActivatableWindow(window)); } diff --git a/ui/aura/desktop/desktop_activation_client.h b/ui/aura/desktop/desktop_activation_client.h index 5954ac2..1206d21 100644 --- a/ui/aura/desktop/desktop_activation_client.h +++ b/ui/aura/desktop/desktop_activation_client.h @@ -39,7 +39,8 @@ class AURA_EXPORT DesktopActivationClient : public client::ActivationClient, 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: |