Nukes view_manager namespace

mojo/services/window_manager/window_manager_app.h

Index: mojo/services/window_manager/window_manager_app.h
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index 310dbcc97165ff673a1e970b7ed7cd42c9878235..16643933e2cfcf5e263e50cf4f4c46b4a6e8a386 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -40,25 +40,25 @@ class WindowTreeHostMojo;
 
 class WindowManagerApp
     : public ApplicationDelegate,
-      public view_manager::ViewManagerDelegate,
-      public view_manager::NodeObserver,
+      public ViewManagerDelegate,
+      public NodeObserver,
       public WindowTreeHostMojoDelegate,
       public aura::client::FocusChangeObserver,
       public aura::client::ActivationChangeObserver,
       public InterfaceFactoryWithContext<WindowManagerServiceImpl,
                                          WindowManagerApp> {
  public:
-  explicit WindowManagerApp(view_manager::ViewManagerDelegate* delegate);
+  explicit WindowManagerApp(ViewManagerDelegate* delegate);
   virtual ~WindowManagerApp();
 
   void AddConnection(WindowManagerServiceImpl* connection);
   void RemoveConnection(WindowManagerServiceImpl* connection);
 
-  view_manager::Id OpenWindow();
-  view_manager::Id OpenWindowWithURL(const String& url);
-  void SetCapture(view_manager::Id node);
-  void FocusWindow(view_manager::Id node);
-  void ActivateWindow(view_manager::Id node);
+  Id OpenWindow();
+  Id OpenWindowWithURL(const String& url);
+  void SetCapture(Id node);
+  void FocusWindow(Id node);
+  void ActivateWindow(Id node);
 
   bool IsReady() const;
 
@@ -69,17 +69,17 @@ class WindowManagerApp
 
  private:
   typedef std::set<WindowManagerServiceImpl*> Connections;
-  typedef std::map<view_manager::Id, aura::Window*> NodeIdToWindowMap;
+  typedef std::map<Id, aura::Window*> NodeIdToWindowMap;
 
-  // Overridden from view_manager::ViewManagerDelegate:
-  virtual void OnRootAdded(view_manager::ViewManager* view_manager,
-                           view_manager::Node* root) MOJO_OVERRIDE;
+  // Overridden from ViewManagerDelegate:
+  virtual void OnRootAdded(ViewManager* view_manager,
+                           Node* root) MOJO_OVERRIDE;
   virtual void OnViewManagerDisconnected(
-      view_manager::ViewManager* view_manager) MOJO_OVERRIDE;
+      ViewManager* view_manager) MOJO_OVERRIDE;
 
-  // Overridden from view_manager::NodeObserver:
+  // Overridden from NodeObserver:
   virtual void OnTreeChanged(
-      const view_manager::NodeObserver::TreeChangeParams& params) MOJO_OVERRIDE;
+      const NodeObserver::TreeChangeParams& params) MOJO_OVERRIDE;
 
   // Overridden from WindowTreeHostMojoDelegate:
   virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;
@@ -92,22 +92,22 @@ class WindowManagerApp
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) MOJO_OVERRIDE;
 
-  aura::Window* GetWindowForNodeId(view_manager::Id node) const;
+  aura::Window* GetWindowForNodeId(Id node) const;
 
   // Creates an aura::Window for every node in the hierarchy beneath |id|,
   // and adds to the registry so that it can be retrieved later via
   // GetWindowForNodeId().
   // TODO(beng): perhaps Node should have a property bag.
-  void RegisterSubtree(view_manager::Id id, aura::Window* parent);
+  void RegisterSubtree(Id id, aura::Window* parent);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
-  void UnregisterSubtree(view_manager::Id id);
+  void UnregisterSubtree(Id id);
 
-  view_manager::ViewManagerDelegate* wrapped_delegate_;
+  ViewManagerDelegate* wrapped_delegate_;
 
-  view_manager::ViewManager* view_manager_;
-  view_manager::ViewManagerClientFactory view_manager_client_factory_;
-  view_manager::Node* root_;
+  ViewManager* view_manager_;
+  ViewManagerClientFactory view_manager_client_factory_;
+  Node* root_;
 
   scoped_ptr<AuraInit> aura_init_;
   scoped_ptr<WindowTreeHostMojo> window_tree_host_;