Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/services/view_manager/view_manager_connection.cc

 // 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.
 
 #include "mojo/services/view_manager/view_manager_connection.h"
 
 #include "base/stl_util.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
@@ skipping 38 matching lines @@
 
   std::vector<Node*> children(node->GetChildren());
   for (size_t i = 0 ; i < children.size(); ++i) {
     (*index)++;
     NodeToINode(children[i], array_builder, index);
   }
 }
 
 }  // namespace
 
-ViewManagerConnection::ViewManagerConnection() : id_(0) {
+ViewManagerConnection::ViewManagerConnection() : client_(NULL), id_(0) {
 }
 
 ViewManagerConnection::~ViewManagerConnection() {
   // Delete any views we own.
   while (!view_map_.empty()) {
     bool result = DeleteViewImpl(this, view_map_.begin()->second->id(), 0);
     DCHECK(result);
   }
 
   // We're about to destroy all our nodes. Detach any views from them.
   for (NodeMap::iterator i = node_map_.begin(); i != node_map_.end(); ++i) {
     if (i->second->view()) {
       bool result = SetViewImpl(i->second->id(), ViewId(), 0);
       DCHECK(result);
     }
   }
 
   STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end());
   context()->RemoveConnection(this);
 }
 
-void ViewManagerConnection::Initialize(
-    ServiceConnector<ViewManagerConnection, RootNodeManager>* service_factory,
-    ScopedMessagePipeHandle client_handle) {
+void ViewManagerConnection::Initialize() {
   DCHECK_EQ(0, id_);  // Should only get Initialize() once.
-  ServiceConnection<IViewManager, ViewManagerConnection, RootNodeManager>::
-      Initialize(service_factory, client_handle.Pass());
   id_ = context()->GetAndAdvanceNextConnectionId();
   context()->AddConnection(this);
-  client()->OnConnectionEstablished(id_);
+  client_->OnConnectionEstablished(id_);
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
   if (id_ == id.connection_id) {
     NodeMap::iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
   return context()->GetNode(id);
 }
 
 View* ViewManagerConnection::GetView(const ViewId& id) {
   if (id_ == id.connection_id) {
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
   return context()->GetView(id);
 }
 
 void ViewManagerConnection::NotifyNodeHierarchyChanged(
     const NodeId& node,
     const NodeId& new_parent,
     const NodeId& old_parent,
     TransportChangeId change_id) {
-  client()->OnNodeHierarchyChanged(NodeIdToTransportId(node),
+  client_->OnNodeHierarchyChanged(NodeIdToTransportId(node),
                                    NodeIdToTransportId(new_parent),
                                    NodeIdToTransportId(old_parent),
                                    change_id);
 }
 
 void ViewManagerConnection::NotifyNodeViewReplaced(
     const NodeId& node,
     const ViewId& new_view_id,
     const ViewId& old_view_id,
     TransportChangeId change_id) {
-  client()->OnNodeViewReplaced(NodeIdToTransportId(node),
+  client_->OnNodeViewReplaced(NodeIdToTransportId(node),
                                ViewIdToTransportId(new_view_id),
                                ViewIdToTransportId(old_view_id),
                                change_id);
 }
 
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
                                            const NodeId& node_id,
                                            TransportChangeId change_id) {
   DCHECK_EQ(node_id.connection_id, id_);
   Node* node = GetNode(node_id);
@@ skipping 33 matching lines @@
   if (!node)
     return false;
   View* view = GetView(view_id);
   if (!view && view_id != ViewId())
     return false;
   RootNodeManager::ScopedChange change(this, context(), change_id);
   node->SetView(view);
   return true;
 }
 
+void ViewManagerConnection::SetClient(IViewManagerClient* client) {
+  client_ = client;
+}
+
 void ViewManagerConnection::CreateNode(
     TransportConnectionSpecificNodeId node_id,
     const Callback<void(bool)>& callback) {
   // Negative values are reserved.
   if (node_map_.find(node_id) != node_map_.end()) {
     callback.Run(false);
     return;
   }
   node_map_[node_id] = new Node(this, NodeId(id_, node_id));
   callback.Run(true);
@@ skipping 91 matching lines @@
 
 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
                                                const ViewId& new_view_id,
                                                const ViewId& old_view_id) {
   context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo