Index: content/browser/renderer_host/render_widget_host_view_win.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc |
index fcfeac8668a7e1e134a9dd0c43aa1c674a2b7eff..61bcd44da350973d24e2c71344400013ddf47d4f 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_win.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc |
@@ -46,6 +46,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" |
+#include "ui/base/gestures/gesture_recognizer.h" |
#include "ui/base/ime/composition_text.h" |
#include "ui/base/l10n/l10n_util_win.h" |
#include "ui/base/text/text_elider.h" |
@@ -57,6 +58,7 @@ |
#include "ui/gfx/gdi_util.h" |
#include "ui/gfx/rect.h" |
#include "ui/gfx/screen.h" |
+#include "ui/views/events/event.h" |
#include "webkit/glue/webaccessibility.h" |
#include "webkit/glue/webcursor.h" |
#include "webkit/plugins/npapi/plugin_constants_win.h" |
@@ -333,6 +335,8 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget) |
focus_on_editable_field_(false), |
received_focus_change_after_pointer_down_(false), |
touch_events_enabled_(false), |
+ ALLOW_THIS_IN_INITIALIZER_LIST( |
+ gesture_recognizer_(ui::GestureRecognizer::Create(this))), |
ALLOW_THIS_IN_INITIALIZER_LIST(sys_color_change_listener_(this)) { |
render_widget_host_->SetView(this); |
registrar_.Add(this, |
@@ -1001,6 +1005,39 @@ void RenderWidgetHostViewWin::SetScrollOffsetPinning( |
bool is_pinned_to_left, bool is_pinned_to_right) { |
} |
+bool RenderWidgetHostViewWin::DispatchLongPressGestureEvent( |
tfarina
2012/05/04 00:15:32
these new methods here are not in the same order t
girard
2012/05/04 00:58:30
Done.
|
+ ui::GestureEvent* event) { |
+ // TODO: Implement. |
+ return false; |
+} |
+ |
+bool RenderWidgetHostViewWin::DispatchCancelTouchEvent( |
+ ui::TouchEvent* event) { |
+ // TODO: Implement. |
+ return false; |
+} |
+ |
+ui::TouchEvent* RenderWidgetHostViewWin::CreateTouchEvent( |
+ ui::EventType type, |
+ const gfx::Point& location, |
+ int touch_id, |
+ base::TimeDelta time_stamp) { |
+ return new views::TouchEvent( |
+ type, location.x(), location.y(), 0, touch_id, 0, 0, 0, 0); |
+} |
+ |
+ui::GestureEvent* RenderWidgetHostViewWin::CreateGestureEvent( |
+ ui::EventType type, |
+ const gfx::Point& location, |
+ int flags, |
+ const base::Time time, |
+ float param_first, |
+ float param_second, |
+ unsigned int touch_id_bitfield) { |
+ return new views::GestureEvent(type, location.x(), location.y(), flags, time, |
+ param_first, param_second, touch_id_bitfield); |
tfarina
2012/05/04 00:15:32
fix indentation here, it should be 4 spaces only.
girard
2012/05/04 00:58:30
Done.
|
+} |
+ |
/////////////////////////////////////////////////////////////////////////////// |
// RenderWidgetHostViewWin, private: |