Index: 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 b2c7a3aefdf5cf9e18c52681e10d6093c2d7e001..467acde05c5bdb5aeb5249e6aaa6f9553eb823e8 100644 |
--- a/examples/wm_flow/wm/frame_controller.h |
+++ b/examples/wm_flow/wm/frame_controller.h |
@@ -14,7 +14,6 @@ namespace mojo { |
class NativeWidgetViewManager; |
class Shell; |
class View; |
-class WindowManagerApp; |
} |
namespace views { |
@@ -22,6 +21,10 @@ class View; |
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 @@ class FrameController : mojo::ViewObserver { |
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 @@ class FrameController : mojo::ViewObserver { |
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); |