| Index: content/browser/renderer_host/render_widget_host_view_android.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
|
| index 7ad5cf29eca71485c90c939646c48b6bc7d3d009..89d510e84023db195b6b31deb98c023deea7068e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.h
|
| @@ -34,6 +34,7 @@
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/android/delegated_frame_host_android.h"
|
| #include "ui/android/view_android.h"
|
| +#include "ui/android/view_client.h"
|
| #include "ui/android/window_android_observer.h"
|
| #include "ui/events/android/motion_event_android.h"
|
| #include "ui/events/gesture_detection/filtered_gesture_provider.h"
|
| @@ -63,6 +64,7 @@ struct NativeWebKeyboardEvent;
|
| class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| : public RenderWidgetHostViewBase,
|
| public ui::GestureProviderClient,
|
| + public ui::ViewClient,
|
| public ui::WindowAndroidObserver,
|
| public DelegatedFrameEvictorClient,
|
| public StylusTextSelectorClient,
|
| @@ -154,6 +156,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| void OnDidNavigateMainFrameToNewPage() override;
|
| void SetNeedsBeginFrames(bool needs_begin_frames) override;
|
|
|
| + // ui::ViewClient implementation.
|
| + bool OnTouchEvent(const ui::MotionEventAndroid& event,
|
| + bool is_touch_handle_event);
|
| +
|
| // ui::GestureProviderClient implementation.
|
| void OnGestureEvent(const ui::GestureEventData& gesture) override;
|
|
|
| @@ -212,8 +218,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| const base::string16& html,
|
| const gfx::Rect rect);
|
|
|
| - bool OnTouchEvent(const ui::MotionEvent& event);
|
| - bool OnTouchHandleEvent(const ui::MotionEvent& event);
|
| + bool ProcessTouchEvent(const ui::MotionEvent& event);
|
| + bool ProcessTouchHandleEvent(const ui::MotionEvent& event);
|
| void ResetGestureDetection();
|
| void SetDoubleTapSupportEnabled(bool enabled);
|
| void SetMultiTouchZoomSupportEnabled(bool enabled);
|
|
|