Minor cleanup of view manager

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/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.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"
 
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace service {
 
+class ConnectionManagerDelegate;
 class ViewManagerServiceImpl;
 
 // 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 ErrorHandler {
  public:
@@ skipping 24 matching lines @@
     const ConnectionSpecificId connection_id_;
     const bool is_delete_view_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
     std::set<ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   ConnectionManager(ApplicationConnection* app_connection,
-                    const Callback<void()>& native_viewport_closed_callback);
+                    ConnectionManagerDelegate* delegate);
   ~ConnectionManager() override;
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
-  void AddConnection(ViewManagerServiceImpl* connection);
-  void RemoveConnection(ViewManagerServiceImpl* connection);
+  // Invoked when a ViewManagerServiceImpl's connection encounters an error.
+  void OnConnectionError(ViewManagerServiceImpl* connection);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_view_id| is valid.
   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);
@@ skipping 54 matching lines @@
   void PrepareForChange(ScopedChange* change);
 
   // Balances a call to PrepareForChange().
   void FinishChange();
 
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
-  // Implementation of the two embed variants.
-  ViewManagerServiceImpl* EmbedImpl(
-      ConnectionSpecificId creator_id,
-      const String& url,
-      const ViewId& root_id,
-      InterfaceRequest<ServiceProvider> service_provider);
+  // Adds |connection| to internal maps.
+  void AddConnection(ViewManagerServiceImpl* connection);
 
   // Overridden from ServerViewDelegate:
   void OnViewDestroyed(const ServerView* view) override;
   void OnWillChangeViewHierarchy(const ServerView* view,
                                  const ServerView* new_parent,
                                  const ServerView* old_parent) override;
   void OnViewHierarchyChanged(const ServerView* view,
                               const ServerView* new_parent,
                               const ServerView* old_parent) override;
   void OnViewBoundsChanged(const ServerView* view,
@@ skipping 14 matching lines @@
 
   // InterfaceFactory<ViewManagerService>:
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<ViewManagerService> 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_;
 
-  // 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_;
 
+  bool in_destructor_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_CONNECTION_MANAGER_H_