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

Side by Side Diff: ash/root_window_controller_common.cc

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/root_window_controller.cc ('k') | ash/root_window_controller_unittest.cc » ('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/root_window_controller_common.h"
6 6
7 #include "ash/common/wm/wm_globals.h"
8 #include "ash/common/wm/wm_window.h"
7 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
8 #include "ash/wm/common/wm_globals.h"
9 #include "ash/wm/common/wm_window.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace { 12 namespace {
13 13
14 // Creates a new window for use as a container. 14 // Creates a new window for use as a container.
15 wm::WmWindow* CreateContainer(int window_id, 15 wm::WmWindow* CreateContainer(int window_id,
16 const char* name, 16 const char* name,
17 wm::WmWindow* parent) { 17 wm::WmWindow* parent) {
18 wm::WmWindow* window = wm::WmGlobals::Get()->NewContainerWindow(); 18 wm::WmWindow* window = wm::WmGlobals::Get()->NewContainerWindow();
19 window->SetShellWindowId(window_id); 19 window->SetShellWindowId(window_id);
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 kShellWindowId_MouseCursorContainer, "MouseCursorContainer", root_); 205 kShellWindowId_MouseCursorContainer, "MouseCursorContainer", root_);
206 mouse_cursor_container->SetBoundsInScreenBehaviorForChildren( 206 mouse_cursor_container->SetBoundsInScreenBehaviorForChildren(
207 wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES); 207 wm::WmWindow::BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
208 #endif 208 #endif
209 209
210 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 210 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
211 "PowerButtonAnimationContainer", root_); 211 "PowerButtonAnimationContainer", root_);
212 } 212 }
213 213
214 } // namespace ash 214 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698