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

Unified Diff: ash/wm/overlay_event_filter.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/wm/maximize_bubble_controller.cc ('k') | ash/wm/overlay_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overlay_event_filter.h
===================================================================
--- ash/wm/overlay_event_filter.h (revision 150582)
+++ ash/wm/overlay_event_filter.h (working copy)
@@ -7,7 +7,6 @@
#include "ash/shell_observer.h"
#include "base/compiler_specific.h"
-#include "ui/aura/event.h"
#include "ui/aura/event_filter.h"
namespace ash {
@@ -29,7 +28,7 @@
virtual void Cancel() = 0;
// Returns true if the overlay should be canceled in response to |event|.
- virtual bool IsCancelingKeyEvent(aura::KeyEvent* event) = 0;
+ virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) = 0;
// Returns the window that needs to receive events.
virtual aura::Window* GetWindow() = 0;
@@ -52,13 +51,13 @@
// aura::EventFilter overrides:
virtual bool PreHandleKeyEvent(
- aura::Window* target, aura::KeyEvent* event) OVERRIDE;
+ aura::Window* target, ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(
- aura::Window* target, aura::MouseEvent* event) OVERRIDE;
+ aura::Window* target, ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(
- aura::Window* target, aura::TouchEvent* event) OVERRIDE;
+ aura::Window* target, ui::TouchEventImpl* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
- aura::Window* target, aura::GestureEvent* event) OVERRIDE;
+ aura::Window* target, ui::GestureEventImpl* event) OVERRIDE;
// ShellObserver overrides:
virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
« no previous file with comments | « ash/wm/maximize_bubble_controller.cc ('k') | ash/wm/overlay_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698