Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: mojo/services/view_manager/view_manager_connection.cc

Issue 328873002: Renames view manager Connect methods to Embed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mispelling Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/view_manager/view_manager_connection.cc
diff --git a/mojo/services/view_manager/view_manager_connection.cc b/mojo/services/view_manager/view_manager_connection.cc
index f68469d77fae16d46f16a2aa645ec38d15d1e7dd..7c33bb21bb4c286fe4008ca3b824b20bb30ab013 100644
--- a/mojo/services/view_manager/view_manager_connection.cc
+++ b/mojo/services/view_manager/view_manager_connection.cc
@@ -287,7 +287,7 @@ bool ViewManagerConnection::CanGetNodeTree(const Node* node) const {
(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]));
@@ -646,10 +646,10 @@ void ViewManagerConnection::SetNodeBounds(
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 =
@@ -657,7 +657,7 @@ void ViewManagerConnection::Connect(const String& url,
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);
}
« no previous file with comments | « mojo/services/view_manager/view_manager_connection.h ('k') | mojo/services/view_manager/view_manager_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698