Mojo: more idiomatic C++ bindings

mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.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/public/cpp/view_manager/lib/view_manager_synchronizer.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/shell/connect.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
@@ skipping 36 matching lines @@
     private_view.set_node(node);
     // TODO(beng): this broadcasts notifications locally... do we want this? I
     //             don't think so. same story for LocalAddChild above!
     private_node.LocalSetActiveView(view);
     private_manager.AddView(view->id(), view);
   }
   return node;
 }
 
 ViewTreeNode* BuildNodeTree(ViewManager* manager,
-                            const Array<INode>& nodes) {
+                            const Array<INodePtr>& nodes) {
   std::vector<ViewTreeNode*> parents;
   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(
         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;
   }
   return root;
 }
 
 class ViewManagerTransaction {
  public:
   virtual ~ViewManagerTransaction() {}
@@ skipping 234 matching lines @@
                        const gfx::Rect& bounds,
                        ViewManagerSynchronizer* synchronizer)
       : ViewManagerTransaction(TYPE_SET_BOUNDS, synchronizer),
         node_id_(node_id),
         bounds_(bounds) {}
   virtual ~SetBoundsTransaction() {}
 
  private:
   // Overridden from ViewManagerTransaction:
   virtual void DoCommit() OVERRIDE {
-    AllocationScope scope;
-    service()->SetNodeBounds(node_id_, bounds_, ActionCompletedCallback());
+    service()->SetNodeBounds(
+        node_id_, Rect::From(bounds_), ActionCompletedCallback());
   }
   virtual void DoActionCompleted(bool success) OVERRIDE {
     // TODO(beng): recovery?
   }
 
   const TransportNodeId node_id_;
   const gfx::Rect bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(SetBoundsTransaction);
 };
@@ skipping 18 matching lines @@
     ScopedSharedBufferHandle duped;
     bool result = CreateMapAndDupSharedBuffer(data.size(),
                                               &memory,
                                               &shared_state_handle_,
                                               &duped);
     if (!result)
       return;
 
     memcpy(memory, &data[0], data.size());
 
-    AllocationScope scope;
     service()->SetViewContents(view_id_, duped.Pass(),
                                static_cast<uint32_t>(data.size()),
                                ActionCompletedCallback());
   }
   virtual void DoActionCompleted(bool success) OVERRIDE {
     // TODO(beng): recovery?
   }
 
   bool CreateMapAndDupSharedBuffer(size_t size,
                                    void** memory,
@@ skipping 134 matching lines @@
       new SetViewContentsTransaction(view_id, contents, this));
   Sync();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerSynchronizer, IViewManagerClient implementation:
 
 void ViewManagerSynchronizer::OnViewManagerConnectionEstablished(
     TransportConnectionId connection_id,
     TransportChangeId next_server_change_id,
-    const Array<INode>& nodes) {
+    mojo::Array<INodePtr> nodes) {
   connected_ = true;
   connection_id_ = connection_id;
   next_server_change_id_ = next_server_change_id;
 
   ViewManagerPrivate(view_manager_).set_root(
       BuildNodeTree(view_manager_, nodes));
   if (init_loop_)
     init_loop_->Quit();
 
   Sync();
 }
 
 void ViewManagerSynchronizer::OnServerChangeIdAdvanced(
     uint32_t next_server_change_id) {
   next_server_change_id_ = next_server_change_id;
 }
 
 void ViewManagerSynchronizer::OnNodeBoundsChanged(uint32 node_id,
-                                                  const Rect& old_bounds,
-                                                  const Rect& new_bounds) {
+                                                  RectPtr old_bounds,
+                                                  RectPtr new_bounds) {
   ViewTreeNode* node = view_manager_->GetNodeById(node_id);
-  ViewTreeNodePrivate(node).LocalSetBounds(old_bounds, new_bounds);
+  ViewTreeNodePrivate(node).LocalSetBounds(old_bounds.To<gfx::Rect>(),
+                                           new_bounds.To<gfx::Rect>());
 }
 
 void ViewManagerSynchronizer::OnNodeHierarchyChanged(
     uint32_t node_id,
     uint32_t new_parent_id,
     uint32_t old_parent_id,
     TransportChangeId server_change_id,
-    const Array<INode>& nodes) {
+    mojo::Array<INodePtr> nodes) {
   // TODO: deal with |nodes|.
   next_server_change_id_ = server_change_id + 1;
 
   BuildNodeTree(view_manager_, nodes);
 
   ViewTreeNode* new_parent = view_manager_->GetNodeById(new_parent_id);
   ViewTreeNode* old_parent = view_manager_->GetNodeById(old_parent_id);
   ViewTreeNode* node = view_manager_->GetNodeById(node_id);
   if (new_parent)
     ViewTreeNodePrivate(new_parent).LocalAddChild(node);
@@ skipping 54 matching lines @@
 void ViewManagerSynchronizer::RemoveFromPendingQueue(
     ViewManagerTransaction* transaction) {
   DCHECK_EQ(transaction, pending_transactions_.front());
   pending_transactions_.erase(pending_transactions_.begin());
   if (pending_transactions_.empty() && !changes_acked_callback_.is_null())
     changes_acked_callback_.Run();
 }
 
 }  // namespace view_manager
 }  // namespace mojo