Move content/renderer input handling for web input events to ui

content/browser/android/in_process/synchronous_compositor_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.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"
+#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;
 class SynchronousCompositorExternalBeginFrameSource;
 struct DidOverscrollParams;
 
 // The purpose of this class is to act as the intermediary between the various
 // components that make up the 'synchronous compositor mode' implementation and
 // expose their functionality via the SynchronousCompositor interface.
 // 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 {
  public:
   // For handling upcalls from renderer code; the process id
   // is implicitly that of the in-process renderer.
   static SynchronousCompositorImpl* FromRoutingID(int routing_id);
 
   static void SetGpuServiceInProc(
       scoped_refptr<gpu::InProcessCommandBuffer::Service> service);
 
   ~SynchronousCompositorImpl() override;
 
   // Called by SynchronousCompositorRegistry.
   void DidInitializeRendererObjects(
       SynchronousCompositorOutputSurface* output_surface,
       SynchronousCompositorExternalBeginFrameSource* begin_frame_source,
-      SynchronousInputHandlerProxy* synchronous_input_handler_proxy);
+      ui::SynchronousInputHandlerProxy* synchronous_input_handler_proxy);
   void DidDestroyRendererObjects();
 
   // SynchronousCompositorExternalBeginFrameSourceClient overrides.
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
 
   // SynchronousCompositorOutputSurfaceClient overrides.
   void Invalidate() override;
 
   // SynchronousCompositor overrides.
   scoped_ptr<cc::CompositorFrame> DemandDrawHw(
@@ skipping 38 matching lines @@
   void DidActivatePendingTree();
   void DeliverMessages();
   bool CalledOnValidThread() const;
   void UpdateNeedsBeginFrames();
 
   RenderWidgetHostViewAndroid* const rwhva_;
   const int routing_id_;
   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_;
   bool need_animate_input_;
 
   base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_