Nukes view_manager namespace

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/418983002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285361 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 17 deletions

diff --git a/mojo/examples/window_manager/debug_panel.cc b/mojo/examples/window_manager/debug_panel.cc
index 814aca5..dfd2b2a 100644
--- a/mojo/examples/window_manager/debug_panel.cc
+++ b/mojo/examples/window_manager/debug_panel.cc
@@ -24,7 +24,7 @@ const int kNavigationTargetGroupId = 1;
 
 }  // namespace
 
-DebugPanel::DebugPanel(Delegate* delegate, view_manager::Node* node)
+DebugPanel::DebugPanel(Delegate* delegate, Node* node)
     : delegate_(delegate),
       node_(node),
       navigation_target_label_(new views::Label(
diff --git a/mojo/examples/window_manager/debug_panel.h b/mojo/examples/window_manager/debug_panel.h
index 532ebce..5e6619b 100644
--- a/mojo/examples/window_manager/debug_panel.h
+++ b/mojo/examples/window_manager/debug_panel.h
@@ -20,9 +20,7 @@ class RadioButton;
 
 namespace mojo {
 
-namespace view_manager {
 class Node;
-}
 
 namespace examples {
 
@@ -47,7 +45,7 @@ class DebugPanel : public views::LayoutManager, public views::ButtonListener {
     virtual ~Delegate(){}
   };
 
-  DebugPanel(Delegate* delegate, view_manager::Node* node);
+  DebugPanel(Delegate* delegate, Node* node);
   virtual ~DebugPanel();
 
   navigation::Target navigation_target() const;
@@ -62,7 +60,7 @@ class DebugPanel : public views::LayoutManager, public views::ButtonListener {
   void Navigate(const std::string& url);
 
   Delegate* delegate_;
-  view_manager::Node* node_;
+  Node* node_;
 
   views::Label* navigation_target_label_;
   views::RadioButton* navigation_target_new_;
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
index 1f4e597..4ee5fd3 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/mojo/examples/window_manager/window_manager.cc
@@ -32,16 +32,6 @@
 #undef CreateWindow
 #endif
 
-using mojo::view_manager::Id;
-using mojo::view_manager::Node;
-using mojo::view_manager::NodeObserver;
-using mojo::view_manager::View;
-using mojo::view_manager::ViewManager;
-using mojo::view_manager::ViewManagerClientFactory;
-using mojo::view_manager::ViewManagerDelegate;
-using mojo::view_manager::ViewObserver;
-using mojo::view_manager::WindowManagerDelegate;
-
 namespace mojo {
 namespace examples {
 
@@ -488,9 +478,9 @@ class WindowManager
         keyboard_manager_->node()->Contains(target->node());
   }
 
-  Id CreateControlPanel(view_manager::Node* root) {
+  Id CreateControlPanel(Node* root) {
     Node* node = Node::Create(view_manager_);
-    View* view = view_manager::View::Create(view_manager_);
+    View* view = View::Create(view_manager_);
     root->AddChild(node);
     node->SetActiveView(view);