Nukes view_manager namespace

mojo/examples/wm_flow/wm/wm.cc

Index: mojo/examples/wm_flow/wm/wm.cc
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/mojo/examples/wm_flow/wm/wm.cc
index 197ad0fcdf7543d411ce8e058f398901ffe41e38..6d98b6d9e146e5cb80705d9bf5c7c530f5520b3e 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/mojo/examples/wm_flow/wm/wm.cc
@@ -11,8 +11,8 @@
 namespace examples {
 
 class SimpleWM : public mojo::ApplicationDelegate,
-                 public mojo::view_manager::ViewManagerDelegate,
-                 public mojo::view_manager::WindowManagerDelegate {
+                 public mojo::ViewManagerDelegate,
+                 public mojo::WindowManagerDelegate {
  public:
   SimpleWM()
       : window_manager_app_(new mojo::WindowManagerApp(this)),
@@ -33,44 +33,44 @@ class SimpleWM : public mojo::ApplicationDelegate,
     return true;
   }
 
-  // Overridden from mojo::view_manager::ViewManagerDelegate:
+  // Overridden from mojo::ViewManagerDelegate:
   virtual void OnRootAdded(
-      mojo::view_manager::ViewManager* view_manager,
-      mojo::view_manager::Node* root) MOJO_OVERRIDE {
+      mojo::ViewManager* view_manager,
+      mojo::Node* root) MOJO_OVERRIDE {
     view_manager_ = view_manager;
     root_ = root;
     view_manager_->SetWindowManagerDelegate(this);
 
-    window_container_ = mojo::view_manager::Node::Create(view_manager_);
+    window_container_ = mojo::Node::Create(view_manager_);
     window_container_->SetBounds(root_->bounds());
     root_->AddChild(window_container_);
 
   }
   virtual void OnViewManagerDisconnected(
-      mojo::view_manager::ViewManager* view_manager) MOJO_OVERRIDE {
+      mojo::ViewManager* view_manager) MOJO_OVERRIDE {
     view_manager_ = NULL;
     root_ = NULL;
   }
 
-  // Overridden from mojo::view_manager::WindowManagerDelegate:
+  // Overridden from mojo::WindowManagerDelegate:
   virtual void Embed(const mojo::String& url) MOJO_OVERRIDE {
-    mojo::view_manager::Node* embed_node =
-        mojo::view_manager::Node::Create(view_manager_);
+    mojo::Node* embed_node =
+        mojo::Node::Create(view_manager_);
     embed_node->SetBounds(gfx::Rect(next_window_origin_, gfx::Size(400, 400)));
     window_container_->AddChild(embed_node);
     embed_node->Embed(url);
     next_window_origin_.Offset(50, 50);
   }
-  virtual void DispatchEvent(mojo::view_manager::View* target,
+  virtual void DispatchEvent(mojo::View* target,
                              mojo::EventPtr event) MOJO_OVERRIDE {
     view_manager_->DispatchEvent(target, event.Pass());
   }
 
   scoped_ptr<mojo::WindowManagerApp> window_manager_app_;
 
-  mojo::view_manager::ViewManager* view_manager_;
-  mojo::view_manager::Node* root_;
-  mojo::view_manager::Node* window_container_;
+  mojo::ViewManager* view_manager_;
+  mojo::Node* root_;
+  mojo::Node* window_container_;
 
   gfx::Point next_window_origin_;