Client side name cleanup

mojo/services/public/cpp/view_manager/node_observer.h

Index: mojo/services/public/cpp/view_manager/node_observer.h
diff --git a/mojo/services/public/cpp/view_manager/view_tree_node_observer.h b/mojo/services/public/cpp/view_manager/node_observer.h
similarity index 57%
rename from mojo/services/public/cpp/view_manager/view_tree_node_observer.h
rename to mojo/services/public/cpp/view_manager/node_observer.h
index d39f74892d328defc03dc0ad00d6947b6fb51a86..7b0cdb010b9860c10fdd1c81335b49369cbcfdc0 100644
--- a/mojo/services/public/cpp/view_manager/view_tree_node_observer.h
+++ b/mojo/services/public/cpp/view_manager/node_observer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_TREE_NODE_OBSERVER_H_
-#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_TREE_NODE_OBSERVER_H_
+#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_NODE_OBSERVER_H_
+#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_NODE_OBSERVER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 
-#include "mojo/services/public/cpp/view_manager/view_tree_node.h"
+#include "mojo/services/public/cpp/view_manager/node.h"
 
 namespace gfx {
 class Rect;
@@ -18,10 +18,10 @@ class Rect;
 namespace mojo {
 namespace view_manager {
 
+class Node;
 class View;
-class ViewTreeNode;
 
-class ViewTreeNodeObserver {
+class NodeObserver {
  public:
   enum DispositionChangePhase {
     DISPOSITION_CHANGING,
@@ -30,38 +30,37 @@ class ViewTreeNodeObserver {
 
   struct TreeChangeParams {
     TreeChangeParams();
-    ViewTreeNode* target;
-    ViewTreeNode* old_parent;
-    ViewTreeNode* new_parent;
-    ViewTreeNode* receiver;
+    Node* target;
+    Node* old_parent;
+    Node* new_parent;
+    Node* receiver;
     DispositionChangePhase phase;
   };
 
   virtual void OnTreeChange(const TreeChangeParams& params) {}
 
-  virtual void OnNodeReordered(ViewTreeNode* node,
-                               ViewTreeNode* relative_node,
+  virtual void OnNodeReordered(Node* node,
+                               Node* relative_node,
                                OrderDirection direction,
                                DispositionChangePhase phase) {}
 
-  virtual void OnNodeDestroy(ViewTreeNode* node,
-                             DispositionChangePhase phase) {}
+  virtual void OnNodeDestroy(Node* node, DispositionChangePhase phase) {}
 
-  virtual void OnNodeActiveViewChange(ViewTreeNode* node,
+  virtual void OnNodeActiveViewChange(Node* node,
                                       View* old_view,
                                       View* new_view,
                                       DispositionChangePhase phase) {}
 
-  virtual void OnNodeBoundsChange(ViewTreeNode* node,
+  virtual void OnNodeBoundsChange(Node* node,
                                   const gfx::Rect& old_bounds,
                                   const gfx::Rect& new_bounds,
                                   DispositionChangePhase phase) {}
 
  protected:
-  virtual ~ViewTreeNodeObserver() {}
+  virtual ~NodeObserver() {}
 };
 
 }  // namespace view_manager
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_TREE_NODE_OBSERVER_H_
+#endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_NODE_OBSERVER_H_