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_state_delegate.h" | 8 #include "ash/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_settings.h" | 13 #include "ash/wm/window_state.h" |
14 #include "ui/aura/client/aura_constants.h" | 14 #include "ui/aura/client/aura_constants.h" |
15 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/base/ui_base_types.h" | 17 #include "ui/base/ui_base_types.h" |
18 | 18 |
19 namespace ash { | 19 namespace ash { |
20 namespace { | 20 namespace { |
21 | 21 |
22 // Find a root window that matches the |bounds|. If the virtual screen | 22 // Find a root window that matches the |bounds|. If the virtual screen |
23 // coordinates is enabled and the bounds is specified, the root window | 23 // coordinates is enabled and the bounds is specified, the root window |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 case aura::client::WINDOW_TYPE_POPUP: | 85 case aura::client::WINDOW_TYPE_POPUP: |
86 if (IsSystemModal(window)) | 86 if (IsSystemModal(window)) |
87 return GetSystemModalContainer(target_root, window); | 87 return GetSystemModalContainer(target_root, window); |
88 else if (HasTransientParentWindow(window)) | 88 else if (HasTransientParentWindow(window)) |
89 return GetContainerForWindow(window->transient_parent()); | 89 return GetContainerForWindow(window->transient_parent()); |
90 return GetAlwaysOnTopController(target_root)->GetContainer(window); | 90 return GetAlwaysOnTopController(target_root)->GetContainer(window); |
91 case aura::client::WINDOW_TYPE_CONTROL: | 91 case aura::client::WINDOW_TYPE_CONTROL: |
92 return GetContainerById( | 92 return GetContainerById( |
93 target_root, internal::kShellWindowId_UnparentedControlContainer); | 93 target_root, internal::kShellWindowId_UnparentedControlContainer); |
94 case aura::client::WINDOW_TYPE_PANEL: | 94 case aura::client::WINDOW_TYPE_PANEL: |
95 if (wm::GetWindowSettings(window)->panel_attached()) | 95 if (wm::GetWindowState(window)->panel_attached()) |
96 return GetContainerById(target_root, | 96 return GetContainerById(target_root, |
97 internal::kShellWindowId_PanelContainer); | 97 internal::kShellWindowId_PanelContainer); |
98 else | 98 else |
99 return GetAlwaysOnTopController(target_root)->GetContainer(window); | 99 return GetAlwaysOnTopController(target_root)->GetContainer(window); |
100 case aura::client::WINDOW_TYPE_MENU: | 100 case aura::client::WINDOW_TYPE_MENU: |
101 return GetContainerById( | 101 return GetContainerById( |
102 target_root, internal::kShellWindowId_MenuContainer); | 102 target_root, internal::kShellWindowId_MenuContainer); |
103 case aura::client::WINDOW_TYPE_TOOLTIP: | 103 case aura::client::WINDOW_TYPE_TOOLTIP: |
104 return GetContainerById( | 104 return GetContainerById( |
105 target_root, internal::kShellWindowId_DragImageAndTooltipContainer); | 105 target_root, internal::kShellWindowId_DragImageAndTooltipContainer); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 root, internal::kShellWindowId_SystemModalContainer); | 140 root, internal::kShellWindowId_SystemModalContainer); |
141 } else { | 141 } else { |
142 container = GetContainerById( | 142 container = GetContainerById( |
143 root, internal::kShellWindowId_LockSystemModalContainer); | 143 root, internal::kShellWindowId_LockSystemModalContainer); |
144 } | 144 } |
145 | 145 |
146 return container; | 146 return container; |
147 } | 147 } |
148 | 148 |
149 } // namespace ash | 149 } // namespace ash |
OLD | NEW |