Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index 41416bea1e8b63c40e88b5b15edfe1fe07983288..6ce0dfce6f5bae0262b138e217402fbf62ad5c5c 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -77,6 +77,7 @@ |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "ui/android/window_android.h" |
#include "ui/android/window_android_compositor.h" |
+#include "ui/events/blink/blink_event_util.h" |
#include "ui/events/gesture_detection/gesture_provider_config_helper.h" |
#include "ui/events/gesture_detection/motion_event.h" |
#include "ui/gfx/android/device_display_info.h" |
@@ -851,7 +852,7 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent( |
return false; |
blink::WebTouchEvent web_event = |
- CreateWebTouchEventFromMotionEvent(event, result.did_generate_scroll); |
+ ui::CreateWebTouchEventFromMotionEvent(event, result.did_generate_scroll); |
host_->ForwardTouchEventWithLatencyInfo(web_event, |
CreateLatencyInfo(web_event)); |
@@ -1852,7 +1853,7 @@ void RenderWidgetHostViewAndroid::RunAckCallbacks( |
void RenderWidgetHostViewAndroid::OnGestureEvent( |
const ui::GestureEventData& gesture) { |
blink::WebGestureEvent web_gesture = |
- CreateWebGestureEventFromGestureEventData(gesture); |
+ ui::CreateWebGestureEventFromGestureEventData(gesture); |
// TODO(jdduke): Remove this workaround after Android fixes UiAutomator to |
// stop providing shift meta values to synthetic MotionEvents. This prevents |
// unintended shift+click interpretation of all accessibility clicks. |