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

Side by Side Diff: ash/wm/stacking_controller.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/stacking_controller.h" 5 #include "ash/wm/stacking_controller.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/wm/always_on_top_controller.h" 11 #include "ash/wm/always_on_top_controller.h"
12 #include "ash/wm/coordinate_conversion.h" 12 #include "ash/wm/coordinate_conversion.h"
13 #include "ash/wm/window_state.h" 13 #include "ash/wm/window_state.h"
14 #include "ash/wm/window_state_aura.h"
14 #include "ui/aura/client/aura_constants.h" 15 #include "ui/aura/client/aura_constants.h"
15 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 17 #include "ui/aura/window_event_dispatcher.h"
17 #include "ui/base/ui_base_types.h" 18 #include "ui/base/ui_base_types.h"
18 #include "ui/wm/core/window_util.h" 19 #include "ui/wm/core/window_util.h"
19 20
20 namespace ash { 21 namespace ash {
21 namespace { 22 namespace {
22 23
23 // Find a root window that matches the |bounds|. If the virtual screen 24 // Find a root window that matches the |bounds|. If the virtual screen
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 if (window_container_id < kShellWindowId_LockScreenContainer) { 132 if (window_container_id < kShellWindowId_LockScreenContainer) {
132 container = GetContainerById(root, kShellWindowId_SystemModalContainer); 133 container = GetContainerById(root, kShellWindowId_SystemModalContainer);
133 } else { 134 } else {
134 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer); 135 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer);
135 } 136 }
136 137
137 return container; 138 return container;
138 } 139 }
139 140
140 } // namespace ash 141 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/resize_shadow_and_cursor_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698