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

Unified Diff: ui/aura/root_window.h

Issue 10365009: Adding Gesture Recognition to RenderWidgetHostViewWin (web client) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge cleanup. (Implementing four new virtuals added in the base.) Created 8 years, 7 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 | « ui/aura/event.h ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index ae90f549f6ad93ea022c9aaa9beca0091bbdbe3d..4ef23a677c1eb6eefd48be8615a4590925ac9eef 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -292,18 +292,20 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
virtual internal::FocusManager* GetFocusManager() OVERRIDE;
// Overridden from ui::GestureEventHelper.
- virtual ui::GestureEvent* CreateGestureEvent(ui::EventType type,
+ virtual ui::GestureEvent* CreateGestureEvent(
+ ui::EventType type,
const gfx::Point& location,
int flags,
- const base::Time time,
+ base::Time time,
float param_first,
float param_second,
unsigned int touch_id_bitfield) OVERRIDE;
- virtual ui::TouchEvent* CreateTouchEvent(ui::EventType type,
- const gfx::Point& location,
- int touch_id,
- base::TimeDelta time_stamp) OVERRIDE;
+ virtual ui::TouchEvent* CreateTouchEvent(
+ ui::EventType type,
+ const gfx::Point& location,
+ int touch_id,
+ base::TimeDelta time_stamp) OVERRIDE;
virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE;
virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
« no previous file with comments | « ui/aura/event.h ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698