Renames view manager Connect methods to Embed

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/bind.h"
 #include "base/stl_util.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
@@ skipping 269 matching lines @@
 
   const View* view = GetView(view_id);
   return (view && view_id.connection_id == id_) || view_id == ViewId();
 }
 
 bool ViewManagerConnection::CanGetNodeTree(const Node* node) const {
   return node &&
       (IsNodeDescendantOfRoots(node) || node->id().connection_id == id_);
 }
 
-bool ViewManagerConnection::CanConnect(
+bool ViewManagerConnection::CanEmbed(
     const mojo::Array<uint32_t>& node_ids) const {
   for (size_t i = 0; i < node_ids.size(); ++i) {
     const Node* node = GetNode(NodeIdFromTransportId(node_ids[i]));
     if (!node || node->id().connection_id != id_)
       return false;
   }
   return node_ids.size() > 0;
 }
 
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
@@ skipping 338 matching lines @@
   RootNodeManager::ScopedChange change(
       this, root_node_manager_,
       RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID, false);
   gfx::Rect old_bounds = node->window()->bounds();
   node->window()->SetBounds(bounds.To<gfx::Rect>());
   root_node_manager_->ProcessNodeBoundsChanged(
       node, old_bounds, bounds.To<gfx::Rect>());
   callback.Run(true);
 }
 
-void ViewManagerConnection::Connect(const String& url,
-                                    Array<uint32_t> node_ids,
-                                    const Callback<void(bool)>& callback) {
-  bool success = CanConnect(node_ids);
+void ViewManagerConnection::Embed(const String& url,
+                                  Array<uint32_t> node_ids,
+                                  const Callback<void(bool)>& callback) {
+  bool success = CanEmbed(node_ids);
   if (success) {
     // We may already have this connection, if so reuse it.
     ViewManagerConnection* existing_connection =
         root_node_manager_->GetConnectionByCreator(id_, url.To<std::string>());
     if (existing_connection)
       success = existing_connection->AddRoots(node_ids.storage());
     else
-      root_node_manager_->Connect(id_, url, node_ids);
+      root_node_manager_->Embed(id_, url, node_ids);
   }
   callback.Run(success);
 }
 
 void ViewManagerConnection::OnNodeHierarchyChanged(const Node* node,
                                                    const Node* new_parent,
                                                    const Node* old_parent) {
   root_node_manager_->ProcessNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
@@ skipping 24 matching lines @@
 
   client()->OnViewManagerConnectionEstablished(
       id_,
       root_node_manager_->next_server_change_id(),
       NodesToINodes(to_send));
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo