Refactors event dispatching of NativeViewport into its own interface

mojo/services/view_manager/connection_manager.h

Index: mojo/services/view_manager/connection_manager.h
diff --git a/mojo/services/view_manager/connection_manager.h b/mojo/services/view_manager/connection_manager.h
index 99a772dfd5f9c7d0e9309828ffe624372308fe3a..0a41195832575a4e74a99c9e95a58da09261ffe9 100644
--- a/mojo/services/view_manager/connection_manager.h
+++ b/mojo/services/view_manager/connection_manager.h
@@ -28,6 +28,7 @@ namespace service {
 
 class ConnectionManagerDelegate;
 class ViewManagerServiceImpl;
+class WindowManagerInternalClientImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
 // ViewManagerServiceImpls) as well as providing the root of the hierarchy.
@@ -35,6 +36,7 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager
     : public ServerViewDelegate,
       public WindowManagerInternalClient,
       public InterfaceFactory<ViewManagerService>,
+      public InterfaceFactory<WindowManagerInternalClient>,
       public ErrorHandler {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
@@ -115,8 +117,6 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager
   }
   const ViewManagerServiceImpl* GetConnectionWithRoot(const ViewId& id) const;
 
-  void DispatchViewInputEventToDelegate(EventPtr event);
-
   // These functions trivially delegate to all ViewManagerServiceImpls, which in
   // term notify their clients.
   void ProcessViewDestroyed(ServerView* view);
@@ -184,6 +184,11 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<ViewManagerService> request) override;
 
+  // InterfaceFactory<WindowManagerInternalClient>:
+  virtual void Create(
+      ApplicationConnection* connection,
+      InterfaceRequest<WindowManagerInternalClient> request) override;
+
   // ErrorHandler:
   void OnConnectionError() override;
 
@@ -196,8 +201,6 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager
   // NOTE: |window_manager_vm_service_| is also in |connection_map_|.
   ViewManagerServiceImpl* window_manager_vm_service_;
 
-  WindowManagerInternalServicePtr window_manager_;
-
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
@@ -208,6 +211,8 @@ class MOJO_VIEW_MANAGER_EXPORT ConnectionManager
 
   scoped_ptr<ServerView> root_;
 
+  scoped_ptr<WindowManagerInternalClientImpl> wm_internal_client_impl_;
+
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;