Merge the mojo blink type converter into ui/events/blink

content/renderer/mus/compositor_mus_connection.h

Index: content/renderer/mus/compositor_mus_connection.h
diff --git a/content/renderer/mus/compositor_mus_connection.h b/content/renderer/mus/compositor_mus_connection.h
index b344e2aac6b5ca33c4c36111d925fe40036bbae3..7793a855fc60fd9d7aa19e74f10241b803a8a906 100644
--- a/content/renderer/mus/compositor_mus_connection.h
+++ b/content/renderer/mus/compositor_mus_connection.h
@@ -14,6 +14,7 @@
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/gestures/motion_event_aura.h"
 
 namespace ui {
 struct DidOverscrollParams;
@@ -82,6 +83,8 @@ class CONTENT_EXPORT CompositorMusConnection
       std::unique_ptr<base::Callback<void(ui::mojom::EventResult)>>*
           ack_callback) override;
 
+  std::unique_ptr<blink::WebInputEvent> Convert(const ui::Event& event);

[sadrul, 2016/08/26 02:37:02]

Non-overrides before override. Move this up.

[jonross, 2016/08/26 14:33:50]

Done.

+
   const int routing_id_;
   ui::Window* root_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
@@ -89,6 +92,9 @@ class CONTENT_EXPORT CompositorMusConnection
   InputHandlerManager* const input_handler_manager_;
   std::unique_ptr<ui::WindowSurfaceBinding> window_surface_binding_;
 
+  // Stores the current state of the active pointers targeting this object.
+  ui::MotionEventAura pointer_state_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositorMusConnection);
 };