Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: examples/wm_flow/wm/frame_controller.h

Issue 698543005: Make a pure mojo::View version of the aura::Window FocusController. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: sky comments Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698