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.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);