Chromium Code Reviews| 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..dd601537faef4094bf9d73bb6b1af96f794ef223 100644 |
| --- a/content/browser/android/in_process/synchronous_compositor_impl.h |
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.h |
| @@ -13,13 +13,18 @@ |
| #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" |
| +#include "ui/events/blink/synchronous_input_handler_proxy.h" |
| namespace cc { |
| class InputHandler; |
| } |
| +namespace ui { |
|
boliu
2015/11/16 19:12:12
Not needed
Khushal
2015/11/16 21:12:49
Done.
|
| +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 ui::SynchronousInputHandler, |
| public SynchronousCompositorBase, |
| public SynchronousCompositorExternalBeginFrameSourceClient, |
| public SynchronousCompositorOutputSurfaceClient { |
| @@ -50,7 +55,7 @@ class SynchronousCompositorImpl |
| void DidInitializeRendererObjects( |
| SynchronousCompositorOutputSurface* output_surface, |
| SynchronousCompositorExternalBeginFrameSource* begin_frame_source, |
| - SynchronousInputHandlerProxy* synchronous_input_handler_proxy); |
| + ui::SynchronousInputHandlerProxy* synchronous_input_handler_proxy); |
| void DidDestroyRendererObjects(); |
| // SynchronousCompositorExternalBeginFrameSourceClient overrides. |
| @@ -109,7 +114,7 @@ class SynchronousCompositorImpl |
| SynchronousCompositorClient* const compositor_client_; |
| SynchronousCompositorOutputSurface* output_surface_; |
| SynchronousCompositorExternalBeginFrameSource* begin_frame_source_; |
| - SynchronousInputHandlerProxy* synchronous_input_handler_proxy_; |
| + ui::SynchronousInputHandlerProxy* synchronous_input_handler_proxy_; |
| bool registered_with_client_; |
| bool is_active_; |
| bool renderer_needs_begin_frames_; |