Client side name cleanup

mojo/examples/embedded_app/embedded_app.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/services/navigation/navigation.mojom.h"
+#include "mojo/services/public/cpp/view_manager/node.h"
+#include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.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.h"
-#include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
 #include "ui/events/event_constants.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
+using mojo::view_manager::Node;
+using mojo::view_manager::NodeObserver;
 using mojo::view_manager::View;
 using mojo::view_manager::ViewManager;
 using mojo::view_manager::ViewManagerDelegate;
 using mojo::view_manager::ViewObserver;
-using mojo::view_manager::ViewTreeNode;
-using mojo::view_manager::ViewTreeNodeObserver;
 
 namespace mojo {
 namespace examples {
 
 class EmbeddedApp : public Application,
                     public ViewManagerDelegate,
                     public ViewObserver,
-                    public ViewTreeNodeObserver {
+                    public NodeObserver {
  public:
   EmbeddedApp() : view_manager_(NULL) {
     url::AddStandardScheme("mojo");
   }
   virtual ~EmbeddedApp() {}
 
   void SetNodeColor(uint32 node_id, SkColor color) {
     pending_node_colors_[node_id] = color;
     ProcessPendingNodeColor(node_id);
   }
@@ skipping 26 matching lines @@
   virtual void Initialize() MOJO_OVERRIDE {
     ViewManager::Create(this, this);
     // TODO(aa): Weird for embeddee to talk to embedder by URL. Seems like
     // embedder should be able to specify the SP embeddee receives, then
     // communication can be anonymous.
     ConnectTo<IWindowManager>("mojo:mojo_window_manager", &window_manager_);
     AddService<Navigator>(this);
   }
 
   // Overridden from ViewManagerDelegate:
-  virtual void OnRootAdded(ViewManager* view_manager,
-                           ViewTreeNode* root) OVERRIDE {
+  virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     View* view = View::Create(view_manager);
     view->AddObserver(this);
     root->SetActiveView(view);
     root->AddObserver(this);
 
     roots_[root->id()] = root;
     ProcessPendingNodeColor(root->id());
   }
-  virtual void OnRootRemoved(ViewManager* view_manager,
-                             ViewTreeNode* root) OVERRIDE {
+  virtual void OnRootRemoved(ViewManager* view_manager, Node* root) OVERRIDE {
     roots_.erase(root->id());
 
-    std::map<ViewTreeNode*, View*>::const_iterator it =
-        views_to_reap_.find(root);
+    std::map<Node*, View*>::const_iterator it = views_to_reap_.find(root);
     if (it != views_to_reap_.end())
       it->second->Destroy();
   }
 
   // Overridden from ViewObserver:
   virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
     if (event->action == ui::ET_MOUSE_RELEASED)
       window_manager_->CloseWindow(view->node()->id());
   }
 
-  // Overridden from ViewTreeNodeObserver:
+  // Overridden from NodeObserver:
   virtual void OnNodeActiveViewChange(
-      ViewTreeNode* node,
+      Node* node,
       View* old_view,
       View* new_view,
-      ViewTreeNodeObserver::DispositionChangePhase phase) OVERRIDE {
+      NodeObserver::DispositionChangePhase phase) OVERRIDE {
     if (new_view == 0)
       views_to_reap_[node] = old_view;
   }
 
   void ProcessPendingNodeColor(uint32 node_id) {
     RootMap::iterator root = roots_.find(node_id);
     if (root == roots_.end())
       return;
 
     PendingNodeColors::iterator color = pending_node_colors_.find(node_id);
     if (color == pending_node_colors_.end())
       return;
 
     root->second->active_view()->SetColor(color->second);
     pending_node_colors_.erase(color);
   }
 
 
   view_manager::ViewManager* view_manager_;
   IWindowManagerPtr window_manager_;
-  std::map<ViewTreeNode*, View*> views_to_reap_;
+  std::map<Node*, View*> views_to_reap_;
 
-  typedef std::map<uint32, ViewTreeNode*> RootMap;
+  typedef std::map<uint32, Node*> RootMap;
   RootMap roots_;
 
   // We can receive navigations for nodes we don't have yet.
   typedef std::map<uint32, SkColor> PendingNodeColors;
   PendingNodeColors pending_node_colors_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
 };
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::EmbeddedApp;
 }
 
 }  // namespace mojo