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

Side by Side Diff: ash/common/root_window_controller_common.cc

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge 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 unified diff | Download patch
« no previous file with comments | « ash/common/root_window_controller_common.h ('k') | ash/common/shell_window_ids.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller_common.h" 5 #include "ash/common/root_window_controller_common.h"
6 6
7 #include "ash/common/shell_window_ids.h"
8 #include "ash/common/wm/root_window_layout_manager.h"
7 #include "ash/common/wm/wm_globals.h" 9 #include "ash/common/wm/wm_globals.h"
8 #include "ash/common/wm/wm_window.h" 10 #include "ash/common/wm/wm_window.h"
9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/root_window_layout_manager.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace { 14 namespace {
15 15
16 // Creates a new window for use as a container. 16 // Creates a new window for use as a container.
17 wm::WmWindow* CreateContainer(int window_id, 17 wm::WmWindow* CreateContainer(int window_id,
18 const char* name, 18 const char* name,
19 wm::WmWindow* parent) { 19 wm::WmWindow* parent) {
20 wm::WmWindow* window = wm::WmGlobals::Get()->NewContainerWindow(); 20 wm::WmWindow* window = wm::WmGlobals::Get()->NewContainerWindow();
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 212 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
213 "PowerButtonAnimationContainer", root_); 213 "PowerButtonAnimationContainer", root_);
214 } 214 }
215 215
216 void RootWindowControllerCommon::CreateLayoutManagers() { 216 void RootWindowControllerCommon::CreateLayoutManagers() {
217 root_window_layout_ = new wm::RootWindowLayoutManager(root_); 217 root_window_layout_ = new wm::RootWindowLayoutManager(root_);
218 root_->SetLayoutManager(base::WrapUnique(root_window_layout_)); 218 root_->SetLayoutManager(base::WrapUnique(root_window_layout_));
219 } 219 }
220 220
221 } // namespace ash 221 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/root_window_controller_common.h ('k') | ash/common/shell_window_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698