Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_win.h |
| diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h |
| index e1178947cbc53d71ca5eca1e5e9484fc07b00ea2..58bdbb1649dd6f5e51758b6fca11e29ea6d3612e 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_win.h |
| +++ b/content/browser/renderer_host/render_widget_host_view_win.h |
| @@ -24,6 +24,7 @@ |
| #include "content/common/content_export.h" |
| #include "content/public/browser/notification_observer.h" |
| #include "content/public/browser/notification_registrar.h" |
| +#include "ui/base/gestures/gesture_types.h" |
| #include "ui/base/win/ime_input.h" |
| #include "ui/gfx/native_widget_types.h" |
| #include "ui/gfx/point.h" |
| @@ -48,6 +49,7 @@ class Message; |
| } |
| namespace ui { |
| +class GestureRecognizer; |
| class ViewProp; |
| } |
| @@ -94,7 +96,8 @@ class RenderWidgetHostViewWin |
| public content::RenderWidgetHostViewBase, |
| public content::NotificationObserver, |
| public BrowserAccessibilityDelegate, |
| - public gfx::SysColorChangeListener { |
| + public gfx::SysColorChangeListener, |
| + public ui::GestureEventHelper { |
| public: |
| virtual ~RenderWidgetHostViewWin(); |
| @@ -248,6 +251,21 @@ class RenderWidgetHostViewWin |
| // Implementation of SysColorChangeListener: |
| virtual void OnSysColorChange() OVERRIDE; |
| + // Overridden from ui::GestureEventHelper. |
| + virtual ui::GestureEvent* CreateGestureEvent(ui::EventType type, |
|
tfarina
2012/05/04 00:15:32
move to the next line.
girard
2012/05/04 00:58:30
Done.
|
| + const gfx::Point& location, |
| + int flags, |
| + const base::Time time, |
|
tfarina
2012/05/04 00:15:32
const base::Time& ?
girard
2012/05/04 00:58:30
Agreed. This is a virtual function, so the change
|
| + float param_first, |
| + float param_second, |
| + unsigned int touch_id_bitfield) OVERRIDE; |
|
tfarina
2012/05/04 00:15:32
uint16?
|
| + virtual ui::TouchEvent* CreateTouchEvent(ui::EventType type, |
|
tfarina
2012/05/04 00:15:32
move to the next line.
girard
2012/05/04 00:58:30
Done.
|
| + const gfx::Point& location, |
| + int touch_id, |
| + base::TimeDelta time_stamp) OVERRIDE; |
|
tfarina
2012/05/04 00:15:32
does time_stamp needs to be passed by value? can i
girard
2012/05/04 00:58:30
Another virtual function changes signature;) Done
|
| + virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; |
| + virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; |
| + |
| protected: |
| friend class content::RenderWidgetHostView; |
| @@ -470,6 +488,8 @@ class RenderWidgetHostViewWin |
| // is removed from the list on an TOUCHEVENTF_UP message. |
| WebTouchState touch_state_; |
| + scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; |
| + |
| // True if we're in the midst of a paint operation and should respond to |
| // DidPaintRect() notifications by merely invalidating. See comments on |
| // render_widget_host_view.h:DidPaintRect(). |