Index: content/browser/android/in_process/synchronous_compositor_impl.h |
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h |
index 099fe263f3f1789fd717cc397160dbc9698643f8..2554451f2e5770163e6a391dbad983276560b78d 100644 |
--- a/content/browser/android/in_process/synchronous_compositor_impl.h |
+++ b/content/browser/android/in_process/synchronous_compositor_impl.h |
@@ -10,16 +10,21 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
+#include "components/web_input/synchronous_input_handler_proxy.h" |
#include "content/browser/android/synchronous_compositor_base.h" |
#include "content/renderer/android/synchronous_compositor_external_begin_frame_source.h" |
#include "content/renderer/android/synchronous_compositor_output_surface.h" |
-#include "content/renderer/input/synchronous_input_handler_proxy.h" |
#include "ipc/ipc_message.h" |
namespace cc { |
class InputHandler; |
} |
+namespace web_input { |
+class SynchronousInputHandler; |
+class SynchronousInputHandlerProxy; |
+} |
+ |
namespace content { |
class InputHandlerManager; |
class RenderWidgetHostViewAndroid; |
@@ -32,7 +37,7 @@ struct DidOverscrollParams; |
// This class is created on the main thread but most of the APIs are called |
// from the Compositor thread. |
class SynchronousCompositorImpl |
- : public SynchronousInputHandler, |
+ : public web_input::SynchronousInputHandler, |
public SynchronousCompositorBase, |
public SynchronousCompositorExternalBeginFrameSourceClient, |
public SynchronousCompositorOutputSurfaceClient { |
@@ -50,7 +55,8 @@ class SynchronousCompositorImpl |
void DidInitializeRendererObjects( |
SynchronousCompositorOutputSurface* output_surface, |
SynchronousCompositorExternalBeginFrameSource* begin_frame_source, |
- SynchronousInputHandlerProxy* synchronous_input_handler_proxy); |
+ web_input::SynchronousInputHandlerProxy* |
+ synchronous_input_handler_proxy); |
void DidDestroyRendererObjects(); |
// SynchronousCompositorExternalBeginFrameSourceClient overrides. |
@@ -109,7 +115,8 @@ class SynchronousCompositorImpl |
SynchronousCompositorClient* const compositor_client_; |
SynchronousCompositorOutputSurface* output_surface_; |
SynchronousCompositorExternalBeginFrameSource* begin_frame_source_; |
- SynchronousInputHandlerProxy* synchronous_input_handler_proxy_; |
+ web_input::SynchronousInputHandlerProxy* |
+ synchronous_input_handler_proxy_; |
bool registered_with_client_; |
bool is_active_; |
bool renderer_needs_begin_frames_; |