Client side name cleanup

Client side name cleanup

ViewTreeNode*->Node*
ViewManagerSynchcronizer->ViewManagerClientImpl

R=sky@chromium.org
TBR=sky@chromium.org
http://crbug.com/384443

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=277775

[Ben Goodger (Google), 2014-06-16 19:37:43]

The CQ bit was checked by ben@chromium.org

[commit-bot: I haz the power, 2014-06-16 19:39:49]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ben@chromium.org/338093008/1

[sky, 2014-06-16 19:42:22]

LGTM

[commit-bot: I haz the power, 2014-06-17 02:29:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-17 02:29:45]

Failed to apply patch for
mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A        
mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
  Copied mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
-> mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
  patching file
mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
  Hunk #2 FAILED at 27.
  Hunk #6 FAILED at 132.
  Hunk #22 FAILED at 571.
  Hunk #23 FAILED at 680.
  4 out of 30 hunks FAILED -- saving rejects to file
mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc.rej

Patch:   NR 
mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc->mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.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_client_impl.cc
similarity index 69%
rename from
mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
rename to mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
index
3568ae5e80fe44420632efd3499f0ac30c9eaeeb..8d408eddcd9cb69e37826f0ce8557184ae939b65
100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
@@ -2,19 +2,19 @@
 // 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 "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/services/public/cpp/view_manager/lib/node_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
+#include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
-#include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
@@ -27,42 +27,42 @@ Id MakeTransportId(ConnectionSpecificId connection_id,
 }
 
 // Helper called to construct a local node/view object from transport data.
-ViewTreeNode* AddNodeToViewManager(ViewManagerSynchronizer* synchronizer,
-                                   ViewTreeNode* parent,
-                                   Id node_id,
-                                   Id view_id,
-                                   const gfx::Rect& bounds) {
+Node* AddNodeToViewManager(ViewManagerClientImpl* client,
+                           Node* parent,
+                           Id node_id,
+                           Id view_id,
+                           const gfx::Rect& bounds) {
   // We don't use the ctor that takes a ViewManager here, since it will call
   // back to the service and attempt to create a new node.
-  ViewTreeNode* node = ViewTreeNodePrivate::LocalCreate();
-  ViewTreeNodePrivate private_node(node);
-  private_node.set_view_manager(synchronizer);
+  Node* node = NodePrivate::LocalCreate();
+  NodePrivate private_node(node);
+  private_node.set_view_manager(client);
   private_node.set_id(node_id);
   private_node.LocalSetBounds(gfx::Rect(), bounds);
   if (parent)
-    ViewTreeNodePrivate(parent).LocalAddChild(node);
-  synchronizer->AddNode(node);
+    NodePrivate(parent).LocalAddChild(node);
+  client->AddNode(node);
 
   // View.
   if (view_id != 0) {
     View* view = ViewPrivate::LocalCreate();
     ViewPrivate private_view(view);
-    private_view.set_view_manager(synchronizer);
+    private_view.set_view_manager(client);
     private_view.set_id(view_id);
     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);
-    synchronizer->AddView(view);
+    client->AddView(view);
   }
   return node;
 }
 
-ViewTreeNode* BuildNodeTree(ViewManagerSynchronizer* synchronizer,
-                            const Array<INodePtr>& nodes) {
-  std::vector<ViewTreeNode*> parents;
-  ViewTreeNode* root = NULL;
-  ViewTreeNode* last_node = NULL;
+Node* BuildNodeTree(ViewManagerClientImpl* client,
+                    const Array<INodePtr>& nodes) {
+  std::vector<Node*> parents;
+  Node* root = NULL;
+  Node* last_node = NULL;
   for (size_t i = 0; i < nodes.size(); ++i) {
     if (last_node && nodes[i]->parent_id == last_node->id()) {
       parents.push_back(last_node);
@@ -70,8 +70,8 @@ ViewTreeNode* BuildNodeTree(ViewManagerSynchronizer*
synchronizer,
       while (parents.back()->id() != nodes[i]->parent_id)
         parents.pop_back();
     }
-    ViewTreeNode* node = AddNodeToViewManager(
-        synchronizer,
+    Node* node = AddNodeToViewManager(
+        client,
         !parents.empty() ? parents.back() : NULL,
         nodes[i]->node_id,
         nodes[i]->view_id,
@@ -85,24 +85,24 @@ ViewTreeNode* BuildNodeTree(ViewManagerSynchronizer*
synchronizer,
 
 // Responsible for removing a root from the ViewManager when that node is
 // destroyed.
-class RootObserver : public ViewTreeNodeObserver {
+class RootObserver : public NodeObserver {
  public:
-  explicit RootObserver(ViewTreeNode* root) : root_(root) {}
+  explicit RootObserver(Node* root) : root_(root) {}
   virtual ~RootObserver() {}
 
  private:
-  // Overridden from ViewTreeNodeObserver:
-  virtual void OnNodeDestroy(ViewTreeNode* node,
+  // Overridden from NodeObserver:
+  virtual void OnNodeDestroy(Node* node,
                              DispositionChangePhase phase) OVERRIDE {
     DCHECK_EQ(node, root_);
-    if (phase != ViewTreeNodeObserver::DISPOSITION_CHANGED)
+    if (phase != NodeObserver::DISPOSITION_CHANGED)
       return;
-    static_cast<ViewManagerSynchronizer*>(
-        ViewTreeNodePrivate(root_).view_manager())->RemoveRoot(root_);
+    static_cast<ViewManagerClientImpl*>(
+        NodePrivate(root_).view_manager())->RemoveRoot(root_);
     delete this;
   }
 
-  ViewTreeNode* root_;
+  Node* root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
@@ -120,9 +120,9 @@ class ViewManagerTransaction {
   bool committed() const { return committed_; }
 
  protected:
-  explicit ViewManagerTransaction(ViewManagerSynchronizer* synchronizer)
+  explicit ViewManagerTransaction(ViewManagerClientImpl* client)
       : committed_(false),
-        synchronizer_(synchronizer) {
+        client_(client) {
   }
 
   // Overridden to perform transaction-specific commit actions.
@@ -132,10 +132,10 @@ class ViewManagerTransaction {
   // service.
   virtual void DoActionCompleted(bool success) = 0;
 
-  IViewManager* service() { return synchronizer_->service_; }
+  IViewManager* service() { return client_->service_; }
 
   Id GetAndAdvanceNextServerChangeId() {
-    return synchronizer_->next_server_change_id_++;
+    return client_->next_server_change_id_++;
   }
 
   base::Callback<void(bool)> ActionCompletedCallback() {
@@ -148,19 +148,19 @@ class ViewManagerTransaction {
   void OnActionCompleted(bool success) {
     DCHECK(success);
     DoActionCompleted(success);
-    synchronizer_->RemoveFromPendingQueue(this);
+    client_->RemoveFromPendingQueue(this);
   }
 
   bool committed_;
-  ViewManagerSynchronizer* synchronizer_;
+  ViewManagerClientImpl* client_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerTransaction);
 };
 
 class CreateViewTransaction : public ViewManagerTransaction {
  public:
-  CreateViewTransaction(Id view_id, ViewManagerSynchronizer* synchronizer)
-      : ViewManagerTransaction(synchronizer),
+  CreateViewTransaction(Id view_id, ViewManagerClientImpl* client)
+      : ViewManagerTransaction(client),
         view_id_(view_id) {}
   virtual ~CreateViewTransaction() {}
 
@@ -180,8 +180,8 @@ class CreateViewTransaction : public ViewManagerTransaction
{
 
 class DestroyViewTransaction : public ViewManagerTransaction {
  public:
-  DestroyViewTransaction(Id view_id, ViewManagerSynchronizer* synchronizer)
-      : ViewManagerTransaction(synchronizer),
+  DestroyViewTransaction(Id view_id, ViewManagerClientImpl* client)
+      : ViewManagerTransaction(client),
         view_id_(view_id) {}
   virtual ~DestroyViewTransaction() {}
 
@@ -199,13 +199,12 @@ class DestroyViewTransaction : public
ViewManagerTransaction {
   DISALLOW_COPY_AND_ASSIGN(DestroyViewTransaction);
 };
 
-class CreateViewTreeNodeTransaction : public ViewManagerTransaction {
+class CreateNodeTransaction : public ViewManagerTransaction {
  public:
-  CreateViewTreeNodeTransaction(Id node_id,
-                                ViewManagerSynchronizer* synchronizer)
-      : ViewManagerTransaction(synchronizer),
+  CreateNodeTransaction(Id node_id, ViewManagerClientImpl* client)
+      : ViewManagerTransaction(client),
         node_id_(node_id) {}
-  virtual ~CreateViewTreeNodeTransaction() {}
+  virtual ~CreateNodeTransaction() {}
 
  private:
   // Overridden from ViewManagerTransaction:
@@ -221,16 +220,15 @@ class CreateViewTreeNodeTransaction : public
ViewManagerTransaction {
 
   const Id node_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(CreateViewTreeNodeTransaction);
+  DISALLOW_COPY_AND_ASSIGN(CreateNodeTransaction);
 };
 
-class DestroyViewTreeNodeTransaction : public ViewManagerTransaction {
+cl…
(message too large)

[Ben Goodger (Google), 2014-06-17 16:09:54]

Committed patchset #2 manually as r277775 (presubmit successful).