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

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Issue 294833002: Mojo: more idiomatic C++ bindings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more 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/public/cpp/view_manager/lib/view_manager_synchronizer.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
index 0d2642f910064009be154119d4a619286cd8e2bd..06401c5884def115f705e07182fe136d424a4227 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
@@ -394,7 +394,7 @@ void ViewManagerSynchronizer::SetActiveView(TransportNodeId node_id,
void ViewManagerSynchronizer::OnConnectionEstablished(
TransportConnectionId connection_id,
TransportChangeId next_server_change_id,
- const mojo::Array<INode>& nodes) {
+ mojo::Array<INodePtr> nodes) {
connected_ = true;
connection_id_ = connection_id;
next_server_change_id_ = next_server_change_id;
@@ -404,17 +404,17 @@ void ViewManagerSynchronizer::OnConnectionEstablished(
ViewTreeNode* root = NULL;
ViewTreeNode* last_node = NULL;
for (size_t i = 0; i < nodes.size(); ++i) {
- if (last_node && nodes[i].parent_id() == last_node->id()) {
+ if (last_node && nodes[i]->parent_id == last_node->id()) {
parents.push_back(last_node);
} else if (!parents.empty()) {
- while (parents.back()->id() != nodes[i].parent_id())
+ while (parents.back()->id() != nodes[i]->parent_id)
parents.pop_back();
}
ViewTreeNode* node =
AddNodeToViewManager(view_manager_,
!parents.empty() ? parents.back() : NULL,
- nodes[i].node_id(),
- nodes[i].view_id());
+ nodes[i]->node_id,
+ nodes[i]->view_id);
if (!last_node)
root = node;
last_node = node;
@@ -436,7 +436,7 @@ void ViewManagerSynchronizer::OnNodeHierarchyChanged(
uint32_t new_parent_id,
uint32_t old_parent_id,
TransportChangeId server_change_id,
- const mojo::Array<INode>& nodes) {
+ mojo::Array<INodePtr> nodes) {
// TODO: deal with |nodes|.
next_server_change_id_ = server_change_id + 1;

Powered by Google App Engine
This is Rietveld 408576698