Refactors event dispatching of NativeViewport into its own interface

mojo/services/view_manager/connection_manager.h

 // Copyright 2014 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 MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 10 matching lines @@
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 
 class ApplicationConnection;
 
 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.
 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
   // clients are notified correctly.
   class ScopedChange {
    public:
     ScopedChange(ViewManagerServiceImpl* connection,
                  ConnectionManager* connection_manager,
                  bool is_delete_view);
     ~ScopedChange();
@@ skipping 60 matching lines @@
   // Returns true if OnConnectionMessagedClient() was invoked for id.
   bool DidConnectionMessageClient(ConnectionSpecificId id) const;
 
   // Returns the ViewManagerServiceImpl that has |id| as a root.
   ViewManagerServiceImpl* GetConnectionWithRoot(const ViewId& id) {
     return const_cast<ViewManagerServiceImpl*>(
         const_cast<const ConnectionManager*>(this)->GetConnectionWithRoot(id));
   }
   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);
   void ProcessViewBoundsChanged(const ServerView* view,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessWillChangeViewHierarchy(const ServerView* view,
                                       const ServerView* new_parent,
                                       const ServerView* old_parent);
   void ProcessViewHierarchyChanged(const ServerView* view,
@@ skipping 47 matching lines @@
                              const std::vector<uint8_t>* new_data) override;
 
   // WindowManagerInternalClient:
   virtual void DispatchInputEventToView(Id transport_view_id,
                                         EventPtr event) override;
 
   // InterfaceFactory<ViewManagerService>:
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<ViewManagerService> request) override;
 
+  // InterfaceFactory<WindowManagerInternalClient>:
+  virtual void Create(
+      ApplicationConnection* connection,
+      InterfaceRequest<WindowManagerInternalClient> request) override;
+
   // ErrorHandler:
   void OnConnectionError() override;
 
   ApplicationConnection* app_connection_;
 
   ConnectionManagerDelegate* delegate_;
 
   // The ViewManager implementation provided to the initial connection (the
   // WindowManager).
   // 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_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   DisplayManager display_manager_;
 
   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_;
 
   bool in_destructor_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_