diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 18:05:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 18:05:25 +0000 |
| commit | ca70609833412dd0cdc758724a92681474d62ee2 (patch) | |
| tree | 3f101230764f644cd1c0a2b7cb52aa556991aa82 /ui/aura/desktop | |
| parent | cb3221b804cdad65aaade7faff1f612644dee4a3 (diff) | |
| download | chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.zip chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.tar.gz chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.tar.bz2 | |
Convert Aura to use ui::Event.
http://crbug.com/125937
TEST=existing
Review URL: https://chromiumcodereview.appspot.com/10827145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150587 0039d316-1c4b-4281-b951-d872f2087c98
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: |