Nukes view_manager namespace

mojo/services/window_manager/window_manager_app.cc

Index: mojo/services/window_manager/window_manager_app.cc
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index ccc38984be14c34694f5a59c45f1b734381bebf1..42c9e03fa14543ad92db5a3c34699dcda86c88d2 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -18,14 +18,14 @@
 #include "ui/wm/core/focus_rules.h"
 #include "ui/wm/public/activation_client.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(mojo::view_manager::Node*);
+DECLARE_WINDOW_PROPERTY_TYPE(mojo::Node*);
 
 namespace mojo {
 namespace {
 
-DEFINE_WINDOW_PROPERTY_KEY(view_manager::Node*, kNodeKey, NULL);
+DEFINE_WINDOW_PROPERTY_KEY(Node*, kNodeKey, NULL);
 
-view_manager::Id GetIdForWindow(aura::Window* window) {
+Id GetIdForWindow(aura::Window* window) {
   return window ? window->GetProperty(kNodeKey)->id() : 0;
 }
 
@@ -70,7 +70,7 @@ class WMFocusRules : public wm::FocusRules {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
-WindowManagerApp::WindowManagerApp(view_manager::ViewManagerDelegate* delegate)
+WindowManagerApp::WindowManagerApp(ViewManagerDelegate* delegate)
     : InterfaceFactoryWithContext(this),
       wrapped_delegate_(delegate),
       view_manager_(NULL),
@@ -98,32 +98,32 @@ void WindowManagerApp::RemoveConnection(WindowManagerServiceImpl* connection) {
   connections_.erase(connection);
 }
 
-view_manager::Id WindowManagerApp::OpenWindow() {
-  view_manager::Node* node = view_manager::Node::Create(view_manager_);
+Id WindowManagerApp::OpenWindow() {
+  Node* node = Node::Create(view_manager_);
   root_->AddChild(node);
   return node->id();
 }
 
-view_manager::Id WindowManagerApp::OpenWindowWithURL(const String& url) {
-  view_manager::Node* node = view_manager::Node::Create(view_manager_);
+Id WindowManagerApp::OpenWindowWithURL(const String& url) {
+  Node* node = Node::Create(view_manager_);
   root_->AddChild(node);
   node->Embed(url);
   return node->id();
 }
 
-void WindowManagerApp::SetCapture(view_manager::Id node) {
+void WindowManagerApp::SetCapture(Id node) {
   capture_client_->capture_client()->SetCapture(GetWindowForNodeId(node));
   // TODO(beng): notify connected clients that capture has changed, probably
   //             by implementing some capture-client observer.
 }
 
-void WindowManagerApp::FocusWindow(view_manager::Id node) {
+void WindowManagerApp::FocusWindow(Id node) {
   aura::Window* window = GetWindowForNodeId(node);
   DCHECK(window);
   focus_client_->FocusWindow(window);
 }
 
-void WindowManagerApp::ActivateWindow(view_manager::Id node) {
+void WindowManagerApp::ActivateWindow(Id node) {
   aura::Window* window = GetWindowForNodeId(node);
   DCHECK(window);
   activation_client_->ActivateWindow(window);
@@ -148,10 +148,10 @@ bool WindowManagerApp::ConfigureIncomingConnection(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WindowManagerApp, view_manager::ViewManagerDelegate implementation:
+// WindowManagerApp, ViewManagerDelegate implementation:
 
-void WindowManagerApp::OnRootAdded(view_manager::ViewManager* view_manager,
-                                   view_manager::Node* root) {
+void WindowManagerApp::OnRootAdded(ViewManager* view_manager,
+                                   Node* root) {
   DCHECK(!view_manager_ && !root_);
   view_manager_ = view_manager;
   root_ = root;
@@ -180,7 +180,7 @@ void WindowManagerApp::OnRootAdded(view_manager::ViewManager* view_manager,
 }
 
 void WindowManagerApp::OnViewManagerDisconnected(
-    view_manager::ViewManager* view_manager) {
+    ViewManager* view_manager) {
   DCHECK_EQ(view_manager_, view_manager);
   wrapped_delegate_->OnViewManagerDisconnected(view_manager);
   root_->RemoveObserver(this);
@@ -190,10 +190,10 @@ void WindowManagerApp::OnViewManagerDisconnected(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WindowManagerApp, view_manager::NodeObserver implementation:
+// WindowManagerApp, NodeObserver implementation:
 
 void WindowManagerApp::OnTreeChanged(
-    const view_manager::NodeObserver::TreeChangeParams& params) {
+    const NodeObserver::TreeChangeParams& params) {
   DCHECK_EQ(params.receiver, root_);
   DCHECK(params.old_parent || params.new_parent);
   if (!params.target)
@@ -248,31 +248,31 @@ void WindowManagerApp::OnWindowActivated(aura::Window* gained_active,
 // WindowManagerApp, private:
 
 aura::Window* WindowManagerApp::GetWindowForNodeId(
-    view_manager::Id node) const {
+    Id node) const {
   NodeIdToWindowMap::const_iterator it = node_id_to_window_map_.find(node);
   return it != node_id_to_window_map_.end() ? it->second : NULL;
 }
 
-void WindowManagerApp::RegisterSubtree(view_manager::Id id,
+void WindowManagerApp::RegisterSubtree(Id id,
                                        aura::Window* parent) {
-  view_manager::Node* node = view_manager_->GetNodeById(id);
+  Node* node = view_manager_->GetNodeById(id);
   DCHECK(node_id_to_window_map_.find(id) == node_id_to_window_map_.end());
   aura::Window* window = new aura::Window(NULL);
   window->SetProperty(kNodeKey, node);
   parent->AddChild(window);
   node_id_to_window_map_[id] = window;
-  view_manager::Node::Children::const_iterator it = node->children().begin();
+  Node::Children::const_iterator it = node->children().begin();
   for (; it != node->children().end(); ++it)
     RegisterSubtree((*it)->id(), window);
 }
 
-void WindowManagerApp::UnregisterSubtree(view_manager::Id id) {
-  view_manager::Node* node = view_manager_->GetNodeById(id);
+void WindowManagerApp::UnregisterSubtree(Id id) {
+  Node* node = view_manager_->GetNodeById(id);
   NodeIdToWindowMap::iterator it = node_id_to_window_map_.find(id);
   DCHECK(it != node_id_to_window_map_.end());
   scoped_ptr<aura::Window> window(it->second);
   node_id_to_window_map_.erase(it);
-  view_manager::Node::Children::const_iterator child = node->children().begin();
+  Node::Children::const_iterator child = node->children().begin();
   for (; child != node->children().end(); ++child)
     UnregisterSubtree((*child)->id());
 }