Renames view manager Connect methods to Embed

mojo/services/view_manager/root_node_manager.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/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/view_manager/view.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
@@ skipping 60 matching lines @@
   connection_map_.erase(connection->id());
   connections_created_by_connect_.erase(connection);
 
   // Notify remaining connections so that they can cleanup.
   for (ConnectionMap::const_iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->OnViewManagerConnectionDestroyed(connection->id());
   }
 }
 
-void RootNodeManager::InitialConnect(const std::string& url) {
+void RootNodeManager::EmbedRoot(const std::string& url) {
   CHECK(connection_map_.empty());
   Array<Id> roots(0);
-  ConnectImpl(kRootConnection, String::From(url), roots);
+  EmbedImpl(kRootConnection, String::From(url), roots);
 }
 
-void RootNodeManager::Connect(ConnectionSpecificId creator_id,
-                              const String& url,
-                              const Array<Id>& node_ids) {
+void RootNodeManager::Embed(ConnectionSpecificId creator_id,
+                            const String& url,
+                            const Array<Id>& node_ids) {
   CHECK_GT(node_ids.size(), 0u);
-  ConnectImpl(creator_id, url, node_ids)->set_delete_on_connection_error();
+  EmbedImpl(creator_id, url, node_ids)->set_delete_on_connection_error();
 }
 
 ViewManagerConnection* RootNodeManager::GetConnection(
     ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? NULL : i->second;
 }
 
 Node* RootNodeManager::GetNode(const NodeId& id) {
   if (id == root_.id())
@@ skipping 81 matching lines @@
 }
 
 void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
   CHECK(current_change_);
   if (current_change_->change_type() == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
     next_server_change_id_++;
   current_change_ = NULL;
 }
 
-ViewManagerConnection* RootNodeManager::ConnectImpl(
+ViewManagerConnection* RootNodeManager::EmbedImpl(
     const ConnectionSpecificId creator_id,
     const String& url,
     const Array<Id>& node_ids) {
   MessagePipe pipe;
   service_provider_->ConnectToService(
       url,
       ViewManagerConnection::Client::Name_,
       pipe.handle1.Pass(),
       String());
   ViewManagerConnection* connection =
@@ skipping 18 matching lines @@
 }
 
 void RootNodeManager::OnViewInputEvent(const View* view,
                                        const ui::Event* event) {
   GetConnection(view->id().connection_id)->ProcessViewInputEvent(view, event);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo