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

Unified Diff: ash/wm/system_gesture_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/shelf_layout_manager.cc ('k') | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.h
===================================================================
--- ash/wm/system_gesture_event_filter.h (revision 150582)
+++ ash/wm/system_gesture_event_filter.h (working copy)
@@ -17,12 +17,13 @@
#include <map>
namespace aura {
-class KeyEvent;
-class LocatedEvent;
-class MouseEvent;
class Window;
}
+namespace ui {
+class LocatedEvent;
+}
+
namespace ash {
namespace test {
@@ -58,7 +59,7 @@
virtual ~LongPressAffordanceAnimation();
// Display or removes long press affordance according to the |event|.
- void ProcessEvent(aura::Window* target, aura::LocatedEvent* event);
+ void ProcessEvent(aura::Window* target, ui::LocatedEvent* event);
private:
friend class ash::test::SystemGestureEventFilterTest;
@@ -92,14 +93,15 @@
// Overridden from aura::EventFilter:
virtual bool PreHandleKeyEvent(aura::Window* target,
- aura::KeyEvent* event) OVERRIDE;
+ ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(aura::Window* target,
- aura::MouseEvent* event) OVERRIDE;
- virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
- aura::TouchEvent* event) OVERRIDE;
+ ui::MouseEvent* event) OVERRIDE;
+ virtual ui::TouchStatus PreHandleTouchEvent(
+ aura::Window* target,
+ ui::TouchEventImpl* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
aura::Window* target,
- aura::GestureEvent* event) OVERRIDE;
+ ui::GestureEventImpl* event) OVERRIDE;
// Overridden from aura::WindowObserver.
virtual void OnWindowVisibilityChanged(aura::Window* window,
@@ -114,15 +116,15 @@
// Handle events meant for volume / brightness. Returns true when no further
// events from this gesture should be sent.
- bool HandleDeviceControl(aura::Window* target, aura::GestureEvent* event);
+ bool HandleDeviceControl(aura::Window* target, ui::GestureEventImpl* event);
// Handle events meant for showing the launcher. Returns true when no further
// events from this gesture should be sent.
- bool HandleLauncherControl(aura::GestureEvent* event);
+ bool HandleLauncherControl(ui::GestureEventImpl* event);
// Handle events meant to switch through applications. Returns true when no
// further events from this gesture should be sent.
- bool HandleApplicationControl(aura::GestureEvent* event);
+ bool HandleApplicationControl(ui::GestureEventImpl* event);
typedef std::map<aura::Window*, SystemPinchHandler*> WindowPinchHandlerMap;
// Created on demand when a system-level pinch gesture is initiated. Destroyed
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698