Revert 270867 "Mojo: Internalize ServiceConnector<>"

trunk/src/mojo/services/view_manager/view_manager_connection.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_CONNECTION_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "mojo/public/cpp/shell/service.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 class Node;
 class RootNodeManager;
 class View;
 
 #if defined(OS_WIN)
 // Equivalent of NON_EXPORTED_BASE which does not work with the template snafu
 // below.
 #pragma warning(push)
 #pragma warning(disable : 4275)
 #endif
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
-    : public InterfaceImpl<IViewManager>,
+    : public ServiceConnection<IViewManager, ViewManagerConnection,
+                               RootNodeManager>,
       public NodeDelegate {
  public:
-  ViewManagerConnection(RootNodeManager* root_node_manager);
+  ViewManagerConnection();
   virtual ~ViewManagerConnection();
 
-  virtual void OnConnectionEstablished() MOJO_OVERRIDE;
-  virtual void OnConnectionError() MOJO_OVERRIDE;
+  TransportConnectionId id() const { return id_; }
 
-  TransportConnectionId id() const { return id_; }
+  // Invoked when connection is established.
+  void Initialize();
 
   // Returns the Node with the specified id.
   Node* GetNode(const NodeId& id);
 
   // Returns the View with the specified id.
   View* GetView(const ViewId& id);
 
   // Notifies the client of a hierarchy change.
   void NotifyNodeHierarchyChanged(const NodeId& node,
                                   const NodeId& new_parent,
@@ skipping 48 matching lines @@
                                ScopedSharedBufferHandle buffer,
                                uint32_t buffer_size) OVERRIDE;
 
   // Overridden from NodeDelegate:
   virtual void OnNodeHierarchyChanged(const NodeId& node,
                                       const NodeId& new_parent,
                                       const NodeId& old_parent) OVERRIDE;
   virtual void OnNodeViewReplaced(const NodeId& node,
                                   const ViewId& new_view_id,
                                   const ViewId& old_view_id) OVERRIDE;
-  RootNodeManager* root_node_manager_;
 
   // Id of this connection as assigned by RootNodeManager. Assigned in
-  // OnConnectionEstablished().
+  // Initialize().
   TransportConnectionId id_;
 
   NodeMap node_map_;
 
   ViewMap view_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_