OLD | NEW |
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" | |
12 #include "ash/wm/aura/wm_window_aura.h" | 11 #include "ash/wm/aura/wm_window_aura.h" |
| 12 #include "ash/wm/common/always_on_top_controller.h" |
13 #include "ash/wm/common/root_window_finder.h" | 13 #include "ash/wm/common/root_window_finder.h" |
14 #include "ash/wm/common/window_state.h" | 14 #include "ash/wm/common/window_state.h" |
15 #include "ash/wm/window_state_aura.h" | 15 #include "ash/wm/window_state_aura.h" |
16 #include "ui/aura/client/aura_constants.h" | 16 #include "ui/aura/client/aura_constants.h" |
17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
19 #include "ui/base/ui_base_types.h" | 19 #include "ui/base/ui_base_types.h" |
20 #include "ui/wm/core/window_util.h" | 20 #include "ui/wm/core/window_util.h" |
21 | 21 |
22 namespace ash { | 22 namespace ash { |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 if (window_container_id < kShellWindowId_LockScreenContainer) { | 140 if (window_container_id < kShellWindowId_LockScreenContainer) { |
141 container = GetContainerById(root, kShellWindowId_SystemModalContainer); | 141 container = GetContainerById(root, kShellWindowId_SystemModalContainer); |
142 } else { | 142 } else { |
143 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer); | 143 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer); |
144 } | 144 } |
145 | 145 |
146 return container; | 146 return container; |
147 } | 147 } |
148 | 148 |
149 } // namespace ash | 149 } // namespace ash |
OLD | NEW |