commit 5f5ce57985e72f230aff1695e93f1bdfba140963
author Scott Violet <sky@chromium.org> Thu Nov 13 18:01:22 2014 -0800
committer Scott Violet <sky@chromium.org> Thu Nov 13 18:01:22 2014 -0800
tree bd3a632b7751a2b4e407c7f0201d94c84fa3e9ce
parent 6e9a1c93733cb802be9591d3e7345342be8c794f

Changes ViewManagerServiceImpl so that it no longer subclasses InterfaceImpl

This is part 1 of refactoring view manager server.

R=msw@chromium.org

Review URL: https://codereview.chromium.org/721243003

mojo/services/view_manager/view_manager_service_impl.h

diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
index 967b766..7c26c3a 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/mojo/services/view_manager/view_manager_service_impl.h
@@ -28,10 +28,12 @@
 class ConnectionManager;
 class ServerView;
 
-// Manages a connection from the client.
-class ViewManagerServiceImpl
-    : public InterfaceImpl<ViewManagerService>,
-      public AccessPolicyDelegate {
+// An instance of ViewManagerServiceImpl is created for every ViewManagerService
+// request. ViewManagerServiceImpl tracks all the state and views created by a
+// client. ViewManagerServiceImpl coordinates with ConnectionManager to update
+// the client (and internal state) as necessary.
+class ViewManagerServiceImpl : public ViewManagerService,
+                               public AccessPolicyDelegate {
  public:
   using ViewIdSet = base::hash_set<Id>;
 
@@ -42,14 +44,17 @@
                          const ViewId& root_id);
   ~ViewManagerServiceImpl() override;
 
-  // Called after bound. |service_provider| is the ServiceProvider to pass to
-  // the client via OnEmbed().
-  void Init(InterfaceRequest<ServiceProvider> service_provider);
+  // |service_provider| is the ServiceProvider to pass to the client via
+  // OnEmbed().
+  void Init(ViewManagerClient* client,
+            InterfaceRequest<ServiceProvider> service_provider);
 
   ConnectionSpecificId id() const { return id_; }
   ConnectionSpecificId creator_id() const { return creator_id_; }
   const std::string& url() const { return url_; }
 
+  ViewManagerClient* client() { return client_; }
+
   // Returns the View with the specified id.
   ServerView* GetView(const ViewId& id) {
     return const_cast<ServerView*>(
@@ -92,11 +97,6 @@
   void ProcessViewPropertiesChanged(const ServerView* view,
                                     bool originated_change);
 
-  // TODO(sky): move this to private section (currently can't because of
-  // bindings).
-  // InterfaceImp overrides:
-  void OnConnectionError() override;
-
  private:
   typedef std::map<ConnectionSpecificId, ServerView*> ViewMap;
 
@@ -202,6 +202,8 @@
   // The URL of the app that embedded the app this connection was created for.
   const std::string creator_url_;
 
+  ViewManagerClient* client_;
+
   scoped_ptr<AccessPolicy> access_policy_;
 
   // The views created by this connection. This connection owns these objects.