commit 489c8f1de0cb4833b5b50b95d18f122c8bb82b3c
author James Robinson <jamesr@chromium.org> Mon Dec 08 12:08:55 2014 -0800
committer James Robinson <jamesr@chromium.org> Mon Dec 08 12:08:55 2014 -0800
tree f5be6f3fe35c70d2860126d1883bd99c7b8383df
parent e07f5dc77621715bef1259197530eea986be2c39

Put code in //services/window_manager in namespace window_manager

R=sky@chromium.org

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

examples/wm_flow/wm/frame_controller.cc

diff --git a/examples/wm_flow/wm/frame_controller.cc b/examples/wm_flow/wm/frame_controller.cc
index 0b3725b..d835a77 100644
--- a/examples/wm_flow/wm/frame_controller.cc
+++ b/examples/wm_flow/wm/frame_controller.cc
@@ -99,7 +99,7 @@
     mojo::Shell* shell,
     mojo::View* view,
     mojo::View** app_view,
-    mojo::WindowManagerApp* window_manager_app)
+    window_manager::WindowManagerApp* window_manager_app)
     : view_(view),
       app_view_(mojo::View::Create(view->view_manager())),
       frame_view_(new views::View),

examples/wm_flow/wm/frame_controller.h

diff --git a/examples/wm_flow/wm/frame_controller.h b/examples/wm_flow/wm/frame_controller.h
index b2c7a3a..467acde 100644
--- a/examples/wm_flow/wm/frame_controller.h
+++ b/examples/wm_flow/wm/frame_controller.h
@@ -14,7 +14,6 @@
 class NativeWidgetViewManager;
 class Shell;
 class View;
-class WindowManagerApp;
 }
 
 namespace views {
@@ -22,6 +21,10 @@
 class Widget;
 }
 
+namespace window_manager {
+class WindowManagerApp;
+}
+
 // FrameController encapsulates the window manager's frame additions to a window
 // created by an application. It renders the content of the frame and responds
 // to any events targeted at it.
@@ -30,7 +33,7 @@
   FrameController(mojo::Shell* shell,
                   mojo::View* view,
                   mojo::View** app_view,
-                  mojo::WindowManagerApp* window_manager_app);
+                  window_manager::WindowManagerApp* window_manager_app);
   virtual ~FrameController();
 
   void CloseWindow();
@@ -52,7 +55,7 @@
   views::Widget* widget_;
   bool maximized_;
   gfx::Rect restored_bounds_;
-  mojo::WindowManagerApp* window_manager_app_;
+  window_manager::WindowManagerApp* window_manager_app_;
   scoped_ptr<FrameEventHandler> frame_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameController);

examples/wm_flow/wm/wm.cc

diff --git a/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
index d31f6ed..9e898c7 100644
--- a/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -23,12 +23,12 @@
 
 class SimpleWM : public mojo::ApplicationDelegate,
                  public mojo::ViewManagerDelegate,
-                 public mojo::WindowManagerDelegate,
+                 public window_manager::WindowManagerDelegate,
                  public mojo::ViewObserver {
  public:
   SimpleWM()
       : shell_(nullptr),
-        window_manager_app_(new mojo::WindowManagerApp(this, this)),
+        window_manager_app_(new window_manager::WindowManagerApp(this, this)),
         view_manager_(NULL),
         root_(NULL),
         window_container_(NULL),
@@ -65,8 +65,8 @@
     root_->AddChild(window_container_);
     window_container_->SetVisible(true);
 
-    window_manager_app_->InitFocus(scoped_ptr<mojo::FocusRules>(
-        new mojo::BasicFocusRules(window_container_)));
+    window_manager_app_->InitFocus(make_scoped_ptr(
+        new window_manager::BasicFocusRules(window_container_)));
   }
   virtual void OnViewManagerDisconnected(
       mojo::ViewManager* view_manager) override {
@@ -130,7 +130,7 @@
 
   scoped_ptr<mojo::ViewsInit> views_init_;
 
-  scoped_ptr<mojo::WindowManagerApp> window_manager_app_;
+  scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
 
   mojo::ViewManager* view_manager_;
   mojo::View* root_;