| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
| 9 #include "ash/wm/always_on_top_controller.h" | 9 #include "ash/wm/always_on_top_controller.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| 11 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
| 12 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 | 13 |
| 14 namespace aura_shell { | 14 namespace ash { |
| 15 namespace internal { | 15 namespace internal { |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 aura::Window* GetContainer(int id) { | 18 aura::Window* GetContainer(int id) { |
| 19 return Shell::GetInstance()->GetContainer(id); | 19 return Shell::GetInstance()->GetContainer(id); |
| 20 } | 20 } |
| 21 | 21 |
| 22 bool IsWindowModal(aura::Window* window) { | 22 bool IsWindowModal(aura::Window* window) { |
| 23 return window->transient_parent() && | 23 return window->transient_parent() && |
| 24 window->GetIntProperty(aura::client::kModalKey); | 24 window->GetIntProperty(aura::client::kModalKey); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 aura::Window* container = NULL; | 84 aura::Window* container = NULL; |
| 85 if (window_container_id < lock_container_id) | 85 if (window_container_id < lock_container_id) |
| 86 container = GetContainer(internal::kShellWindowId_ModalContainer); | 86 container = GetContainer(internal::kShellWindowId_ModalContainer); |
| 87 else | 87 else |
| 88 container = GetContainer(internal::kShellWindowId_LockModalContainer); | 88 container = GetContainer(internal::kShellWindowId_LockModalContainer); |
| 89 | 89 |
| 90 return container; | 90 return container; |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace internal | 93 } // namespace internal |
| 94 } // namespace aura_shell | 94 } // namespace ash |
| OLD | NEW |