| 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/property_util.h" | |
| 14 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" |
| 15 #include "ui/aura/client/aura_constants.h" | 14 #include "ui/aura/client/aura_constants.h" |
| 16 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
| 17 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 18 #include "ui/base/ui_base_types.h" | 17 #include "ui/base/ui_base_types.h" |
| 19 | 18 |
| 20 namespace ash { | 19 namespace ash { |
| 21 namespace { | 20 namespace { |
| 22 | 21 |
| 23 // 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 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 49 return window->transient_parent() && | 48 return window->transient_parent() && |
| 50 window->transient_parent()->type() != aura::client::WINDOW_TYPE_UNKNOWN; | 49 window->transient_parent()->type() != aura::client::WINDOW_TYPE_UNKNOWN; |
| 51 } | 50 } |
| 52 | 51 |
| 53 bool IsPanelAttached(aura::Window* window) { | 52 bool IsPanelAttached(aura::Window* window) { |
| 54 return window->GetProperty(internal::kPanelAttachedKey); | 53 return window->GetProperty(internal::kPanelAttachedKey); |
| 55 } | 54 } |
| 56 | 55 |
| 57 internal::AlwaysOnTopController* | 56 internal::AlwaysOnTopController* |
| 58 GetAlwaysOnTopController(aura::RootWindow* root_window) { | 57 GetAlwaysOnTopController(aura::RootWindow* root_window) { |
| 59 return GetRootWindowController(root_window)->always_on_top_controller(); | 58 return internal::GetRootWindowController(root_window)-> |
| 59 always_on_top_controller(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace | 62 } // namespace |
| 63 | 63 |
| 64 //////////////////////////////////////////////////////////////////////////////// | 64 //////////////////////////////////////////////////////////////////////////////// |
| 65 // StackingController, public: | 65 // StackingController, public: |
| 66 | 66 |
| 67 StackingController::StackingController() { | 67 StackingController::StackingController() { |
| 68 } | 68 } |
| 69 | 69 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 root, internal::kShellWindowId_SystemModalContainer); | 144 root, internal::kShellWindowId_SystemModalContainer); |
| 145 } else { | 145 } else { |
| 146 container = GetContainerById( | 146 container = GetContainerById( |
| 147 root, internal::kShellWindowId_LockSystemModalContainer); | 147 root, internal::kShellWindowId_LockSystemModalContainer); |
| 148 } | 148 } |
| 149 | 149 |
| 150 return container; | 150 return container; |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace ash | 153 } // namespace ash |
| OLD | NEW |