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

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

Issue 291193012: Renames IViewManagerClient::OnConnectionEstablished (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 76656b644c15e66e5f836a58149c9ba8b921c3ba..1d730768b5cdc560cf8a21b1fa6b6dbfd3fffbd6 100644
--- a/mojo/services/view_manager/view_manager_connection.cc
+++ b/mojo/services/view_manager/view_manager_connection.cc
@@ -71,19 +71,6 @@ ViewManagerConnection::~ViewManagerConnection() {
root_node_manager_->RemoveConnection(this);
}
-void ViewManagerConnection::OnConnectionEstablished() {
- DCHECK_EQ(0, id_); // Should only get OnConnectionEstablished() once.
- id_ = root_node_manager_->GetAndAdvanceNextConnectionId();
- root_node_manager_->AddConnection(this);
- std::vector<const Node*> to_send;
- GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
- AllocationScope allocation_scope;
- client()->OnConnectionEstablished(
- id_,
- root_node_manager_->next_server_change_id(),
- NodesToINodes(to_send));
-}
-
const Node* ViewManagerConnection::GetNode(const NodeId& id) const {
if (id_ == id.connection_id) {
NodeMap::const_iterator i = node_map_.find(id.node_id);
@@ -424,7 +411,7 @@ bool ViewManagerConnection::ProcessSetRoots(
for (NodeIdSet::const_iterator i = roots_.begin(); i != roots_.end(); ++i)
GetUnknownNodesFrom(GetNode(NodeIdFromTransportId(*i)), &to_send);
AllocationScope allocation_scope;
- client()->OnConnectionEstablished(
+ client()->OnViewManagerConnectionEstablished(
id_,
root_node_manager_->next_server_change_id(),
NodesToINodes(to_send));
@@ -638,6 +625,19 @@ void ViewManagerConnection::OnNodeViewReplaced(const Node* node,
root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
}
+void ViewManagerConnection::OnConnectionEstablished() {
+ DCHECK_EQ(0, id_); // Should only get OnConnectionEstablished() once.
+ id_ = root_node_manager_->GetAndAdvanceNextConnectionId();
+ root_node_manager_->AddConnection(this);
+ std::vector<const Node*> to_send;
+ GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
+ AllocationScope allocation_scope;
+ client()->OnViewManagerConnectionEstablished(
+ id_,
+ root_node_manager_->next_server_change_id(),
+ NodesToINodes(to_send));
+}
+
} // namespace service
} // namespace view_manager
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698