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

Unified Diff: ash/mus/root_window_controller.h

Issue 2103913003: Converts MaximizeModeWindowManager to use ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@maximize_mode_event_handler
Patch Set: fix chrome Created 4 years, 6 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 | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.h
diff --git a/ash/mus/root_window_controller.h b/ash/mus/root_window_controller.h
index 3a45cdbd8a2d0ed20b0a60c46a027b3da581e1bf..b75f3921bc9b9c57373351833c78f9b4c9da7ff7 100644
--- a/ash/mus/root_window_controller.h
+++ b/ash/mus/root_window_controller.h
@@ -22,6 +22,7 @@ namespace ash {
class AlwaysOnTopController;
class RootWindowControllerCommon;
+class WorkspaceLayoutManager;
namespace mus {
@@ -65,6 +66,9 @@ class RootWindowController : public ShelfLayoutManagerDelegate {
ShelfLayoutManager* GetShelfLayoutManager();
StatusLayoutManager* GetStatusLayoutManager();
+ WorkspaceLayoutManager* workspace_layout_manager() {
+ return workspace_layout_manager_;
+ }
AlwaysOnTopController* always_on_top_controller() {
return always_on_top_controller_.get();
@@ -96,6 +100,8 @@ class RootWindowController : public ShelfLayoutManagerDelegate {
std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
std::unique_ptr<WmShelfMus> wm_shelf_;
+ // Owned by the corresponding container.
+ WorkspaceLayoutManager* workspace_layout_manager_ = nullptr;
std::map<::mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698