| 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 ae532a502a0c1ab04f82d63af8157b3c52a4f300..ac486f5158d116127d765f1a6b99db32c82ae1f9 100644
|
| --- a/examples/wm_flow/wm/frame_controller.h
|
| +++ b/examples/wm_flow/wm/frame_controller.h
|
| @@ -7,14 +7,9 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "mojo/services/public/cpp/view_manager/view_observer.h"
|
| +#include "mojo/services/window_manager/focus_controller.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| -namespace aura {
|
| -namespace client {
|
| -class ActivationClient;
|
| -}
|
| -}
|
| -
|
| namespace mojo {
|
| class NativeWidgetViewManager;
|
| class Shell;
|
| @@ -35,7 +30,6 @@ class FrameController : mojo::ViewObserver {
|
| FrameController(mojo::Shell* shell,
|
| mojo::View* view,
|
| mojo::View** app_view,
|
| - aura::client::ActivationClient* activation_client,
|
| mojo::WindowManagerApp* window_manager_app);
|
| virtual ~FrameController();
|
|
|
| @@ -58,7 +52,6 @@ class FrameController : mojo::ViewObserver {
|
| views::Widget* widget_;
|
| bool maximized_;
|
| gfx::Rect restored_bounds_;
|
| - aura::client::ActivationClient* activation_client_;
|
| mojo::WindowManagerApp* window_manager_app_;
|
| scoped_ptr<FrameEventHandler> frame_event_handler_;
|
|
|
|
|