Splits window manager like methods into ViewManagerServiceDelegate

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>
 
 #include "base/basictypes.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/services/view_manager/display_manager.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/server_view.h"
 #include "mojo/services/view_manager/server_view_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
+#include "mojo/services/view_manager/window_manager_client_impl.h"
 
 namespace ui {
 class Event;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace service {
@@ skipping 40 matching lines @@
   ConnectionManager(ApplicationConnection* app_connection,
                     const Callback<void()>& native_viewport_closed_callback);
   virtual ~ConnectionManager();
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   void AddConnection(ViewManagerServiceImpl* connection);
   void RemoveConnection(ViewManagerServiceImpl* connection);
 
-  // Establishes the initial client. Similar to Connect(), but the resulting
-  // client is allowed to do anything.
-  void EmbedRoot(const std::string& url,
-                 InterfaceRequest<ServiceProvider> service_provider);
+  // Used in two cases:
+  // . Establishes the client for the root.
+  // . Requests to Embed() at an unspecified view. For this case the request
+  //   is passed on to the WindowManagerService.
+  void Embed(const std::string& url,
+             InterfaceRequest<ServiceProvider> service_provider);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_view_id| is valid.
-  void Embed(ConnectionSpecificId creator_id,
-             const String& url,
-             Id transport_view_id,
-             InterfaceRequest<ServiceProvider> service_provider);
+  void EmbedAtView(ConnectionSpecificId creator_id,
+                   const String& url,
+                   Id transport_view_id,
+                   InterfaceRequest<ServiceProvider> service_provider);
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the View identified by |id|.
   ServerView* GetView(const ViewId& id);
 
   ServerView* root() { return root_.get(); }
 
   bool IsProcessingChange() const { return current_change_ != NULL; }
 
   bool is_processing_delete_view() const {
     return current_change_ && current_change_->is_delete_view();
   }
 
   // Invoked when a connection messages a client about the change. This is used
   // to avoid sending ServerChangeIdAdvanced() unnecessarily.
   void OnConnectionMessagedClient(ConnectionSpecificId id);
 
   // 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 DispatchViewInputEventToWindowManager(EventPtr event);
+  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);
@@ skipping 43 matching lines @@
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) override;
   virtual void OnViewSurfaceIdChanged(const ServerView* view) override;
   virtual void OnViewReordered(const ServerView* view,
                                const ServerView* relative,
                                OrderDirection direction) override;
   virtual void OnWillChangeViewVisibility(const ServerView* view) override;
 
   ApplicationConnection* app_connection_;
 
+  WindowManagerClientImpl wm_client_impl_;
+
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   DisplayManager display_manager_;
 
   scoped_ptr<ServerView> root_;
 
   // Set of ViewManagerServiceImpls created by way of Connect(). These have to
   // be explicitly destroyed.
   std::set<ViewManagerServiceImpl*> connections_created_by_connect_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_