| Index: content/renderer/render_widget.h
|
| diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
|
| index 309083cf9db220a4fccd33f5ece447abf6bd22c0..bbd098ff4322a9b776201a66b41933eca4311a27 100644
|
| --- a/content/renderer/render_widget.h
|
| +++ b/content/renderer/render_widget.h
|
| @@ -23,6 +23,7 @@
|
| #include "base/observer_list.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| +#include "cc/input/touch_action.h"
|
| #include "cc/surfaces/local_surface_id.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/cursors/webcursor.h"
|
| @@ -51,7 +52,6 @@
|
| #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
|
| #include "third_party/WebKit/public/web/WebPopupType.h"
|
| #include "third_party/WebKit/public/web/WebTextDirection.h"
|
| -#include "third_party/WebKit/public/web/WebTouchAction.h"
|
| #include "third_party/WebKit/public/web/WebWidget.h"
|
| #include "third_party/WebKit/public/web/WebWidgetClient.h"
|
| #include "ui/base/ime/text_input_mode.h"
|
| @@ -636,7 +636,7 @@ class CONTENT_EXPORT RenderWidget
|
| void HasTouchEventHandlers(bool has_handlers) override;
|
|
|
| // Tell the browser about the actions permitted for a new touch point.
|
| - void SetTouchAction(blink::WebTouchAction touch_action) override;
|
| + void SetTouchAction(cc::TouchAction touch_action) override;
|
|
|
| // Sends an ACK to the browser process during the next compositor frame.
|
| void OnWaitNextFrameForTests(int routing_id);
|
|
|