Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Unified Diff: ash/wm/activation_controller.h

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/touch/touch_uma.cc ('k') | ash/wm/activation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller.h
===================================================================
--- ash/wm/activation_controller.h (revision 150582)
+++ ash/wm/activation_controller.h (working copy)
@@ -38,7 +38,7 @@
// activation. |event| is the revent responsible for initiating the change, or
// NULL if there is no event.
static aura::Window* GetActivatableWindow(aura::Window* window,
- const aura::Event* event);
+ const ui::Event* event);
// Overridden from aura::client::ActivationClient:
virtual void AddObserver(
@@ -49,7 +49,7 @@
virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
virtual aura::Window* GetActiveWindow() OVERRIDE;
virtual bool OnWillFocusWindow(aura::Window* window,
- const aura::Event* event) OVERRIDE;
+ const ui::Event* event) OVERRIDE;
virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
// Overridden from aura::WindowObserver:
@@ -66,7 +66,7 @@
private:
// Implementation of ActivateWindow() with an Event.
void ActivateWindowWithEvent(aura::Window* window,
- const aura::Event* event);
+ const ui::Event* event);
// Shifts activation to the next window, ignoring |window|. Returns the next
// window.
« no previous file with comments | « ash/touch/touch_uma.cc ('k') | ash/wm/activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698