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

Unified Diff: ash/root_window_controller_common.cc

Issue 2032613002: Converts RootWindowLayoutManager to common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/root_window_controller_common.h ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_common.cc
diff --git a/ash/root_window_controller_common.cc b/ash/root_window_controller_common.cc
index 80834425ea2f3b5c41459f7b3d82ff52a87ebd75..2011a268a357ffe8c9750dcf30bd6df19a70df20 100644
--- a/ash/root_window_controller_common.cc
+++ b/ash/root_window_controller_common.cc
@@ -7,6 +7,8 @@
#include "ash/common/wm/wm_globals.h"
#include "ash/common/wm/wm_window.h"
#include "ash/shell_window_ids.h"
+#include "ash/wm/root_window_layout_manager.h"
+#include "base/memory/ptr_util.h"
namespace ash {
namespace {
@@ -27,7 +29,7 @@ wm::WmWindow* CreateContainer(int window_id,
} // namespace
RootWindowControllerCommon::RootWindowControllerCommon(wm::WmWindow* root)
- : root_(root) {}
+ : root_(root), root_window_layout_(nullptr) {}
RootWindowControllerCommon::~RootWindowControllerCommon() {}
@@ -211,4 +213,9 @@ void RootWindowControllerCommon::CreateContainers() {
"PowerButtonAnimationContainer", root_);
}
+void RootWindowControllerCommon::CreateLayoutManagers() {
+ root_window_layout_ = new wm::RootWindowLayoutManager(root_);
+ root_->SetLayoutManager(base::WrapUnique(root_window_layout_));
+}
+
} // namespace ash
« no previous file with comments | « ash/root_window_controller_common.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698