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

Unified Diff: mash/wm/root_window_controller.cc

Issue 2002243002: Gets mash to use WmToplevelWindowEventHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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 | « mash/wm/frame/move_loop_unittest.cc ('k') | mash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.cc
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index ff1f93655786e698bebc81528f11ce603e47c520..a7c040b08cd17c0d14687263f2402e9053fd2fc2 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -10,6 +10,8 @@
#include <sstream>
#include "ash/wm/common/always_on_top_controller.h"
+#include "ash/wm/common/dock/docked_window_layout_manager.h"
+#include "ash/wm/common/panels/panel_layout_manager.h"
#include "ash/wm/common/wm_shell_window_ids.h"
#include "ash/wm/common/workspace/workspace_layout_manager.h"
#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
@@ -311,6 +313,21 @@ void RootWindowController::CreateContainers() {
->SetLayoutManager(base::WrapUnique(new ash::WorkspaceLayoutManager(
WmWindowMus::Get(user_private_windows),
std::move(workspace_layout_manager_delegate))));
+
+ mus::Window* user_private_docked_windows =
+ GetWindowForContainer(mojom::Container::USER_PRIVATE_DOCKED_WINDOWS);
+ WmWindowMus* user_private_docked_windows_wm =
+ WmWindowMus::Get(user_private_docked_windows);
+ layout_managers_.erase(user_private_docked_windows);
+ user_private_docked_windows_wm->SetLayoutManager(base::WrapUnique(
+ new ash::DockedWindowLayoutManager(user_private_docked_windows_wm)));
+
+ mus::Window* user_private_panels =
+ GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
+ WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
+ layout_managers_.erase(user_private_panels);
+ user_private_panels_wm->SetLayoutManager(
+ base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
}
} // namespace wm
« no previous file with comments | « mash/wm/frame/move_loop_unittest.cc ('k') | mash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698