Changes ViewManagerServiceImpl so that it no longer subclasses InterfaceImpl

mojo/services/view_manager/view_manager_service_impl.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_VIEW_MANAGER_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 class Rect;
 }
 
 namespace mojo {
 namespace service {
 
 class AccessPolicy;
 class ConnectionManager;
 class ServerView;
 
 // Manages a connection from the client.

[msw, 2014/11/14 01:42:18]

nit: perhaps expand on this comment?

[sky, 2014/11/14 20:56:03]

Done.

-class ViewManagerServiceImpl
-    : public InterfaceImpl<ViewManagerService>,
-      public AccessPolicyDelegate {
+class ViewManagerServiceImpl : public ViewManagerService,
+                               public AccessPolicyDelegate {
  public:
   using ViewIdSet = base::hash_set<Id>;
 
   ViewManagerServiceImpl(ConnectionManager* connection_manager,
                          ConnectionSpecificId creator_id,
                          const std::string& creator_url,
                          const std::string& url,
                          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*>(
         const_cast<const ViewManagerServiceImpl*>(this)->GetView(id));
   }
   const ServerView* GetView(const ViewId& id) const;
 
   // Returns true if this connection's root is |id|.
   bool IsRoot(const ViewId& id) const;
 
@@ skipping 22 matching lines @@
   void ProcessViewReorder(const ServerView* view,
                           const ServerView* relative_view,
                           OrderDirection direction,
                           bool originated_change);
   void ProcessViewDeleted(const ViewId& view, bool originated_change);
   void ProcessWillChangeViewVisibility(const ServerView* view,
                                        bool originated_change);
   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;
 
   bool IsViewKnown(const ServerView* view) const;
 
   // These functions return true if the corresponding mojom function is allowed
   // for this connection.
   bool CanReorderView(const ServerView* view,
                       const ServerView* relative_view,
                       OrderDirection direction) const;
@@ skipping 85 matching lines @@
   // URL this connection was created for.
   const std::string url_;
 
   // ID of the connection that created us. If 0 it indicates either we were
   // created by the root, or the connection that created us has been destroyed.
   ConnectionSpecificId creator_id_;
 
   // 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.
   ViewMap view_map_;
 
   // The set of views that has been communicated to the client.
   ViewIdSet known_views_;
 
   // The root of this connection. This is a scoped_ptr to reinforce the
   // connection may have no root. A connection has no root if either the root
   // is destroyed or Embed() is invoked on the root.
   scoped_ptr<ViewId> root_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceImpl);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_