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

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

Issue 599213002: First cut at supporting activation in the window manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: / Created 6 years, 3 months 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 | « mojo/examples/wm_flow/wm/DEPS ('k') | mojo/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: mojo/examples/wm_flow/wm/frame_controller.h
diff --git a/mojo/examples/wm_flow/wm/frame_controller.h b/mojo/examples/wm_flow/wm/frame_controller.h
index adb78404c5a2fb0d2bae0b7f60db104d709d1f46..97470f73d07ebcfbf80c4b20b803b27a114413df 100644
--- a/mojo/examples/wm_flow/wm/frame_controller.h
+++ b/mojo/examples/wm_flow/wm/frame_controller.h
@@ -5,12 +5,20 @@
#ifndef MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
#define MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
+#include "base/memory/scoped_ptr.h"
#include "mojo/services/public/cpp/view_manager/view_observer.h"
#include "ui/gfx/geometry/rect.h"
+namespace aura {
+namespace client {
+class ActivationClient;
+}
+}
+
namespace mojo {
class NativeWidgetViewManager;
class View;
+class WindowManagerApp;
}
namespace views {
@@ -23,15 +31,21 @@ class Widget;
// to any events targeted at it.
class FrameController : mojo::ViewObserver {
public:
- FrameController(mojo::View* view, mojo::View** app_view);
+ FrameController(mojo::View* view,
+ mojo::View** app_view,
+ aura::client::ActivationClient* activation_client,
+ mojo::WindowManagerApp* window_manager_app);
virtual ~FrameController();
void CloseWindow();
void ToggleMaximize();
+ void ActivateWindow();
+
private:
class LayoutManager;
friend class LayoutManager;
+ class FrameEventHandler;
virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE;
@@ -42,6 +56,9 @@ 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_;
DISALLOW_COPY_AND_ASSIGN(FrameController);
};
« no previous file with comments | « mojo/examples/wm_flow/wm/DEPS ('k') | mojo/examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698