OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/shell_port.h" | 5 #include "ash/shell_port.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 continue; | 91 continue; |
92 for (const WmWindow* child : system_modal->GetChildren()) { | 92 for (const WmWindow* child : system_modal->GetChildren()) { |
93 if (child->IsSystemModal() && child->GetTargetVisibility()) { | 93 if (child->IsSystemModal() && child->GetTargetVisibility()) { |
94 return true; | 94 return true; |
95 } | 95 } |
96 } | 96 } |
97 } | 97 } |
98 return false; | 98 return false; |
99 } | 99 } |
100 | 100 |
101 void ShellPort::CreateModalBackground(WmWindow* window) { | 101 void ShellPort::CreateModalBackground(aura::Window* window) { |
102 for (WmWindow* root_window : GetAllRootWindows()) { | 102 for (aura::Window* root_window : Shell::GetAllRootWindows()) { |
103 root_window->GetRootWindowController() | 103 RootWindowController::ForWindow(root_window) |
104 ->GetSystemModalLayoutManager(window) | 104 ->GetSystemModalLayoutManager(window) |
105 ->CreateModalBackground(); | 105 ->CreateModalBackground(); |
106 } | 106 } |
107 } | 107 } |
108 | 108 |
109 void ShellPort::OnModalWindowRemoved(WmWindow* removed) { | 109 void ShellPort::OnModalWindowRemoved(aura::Window* removed) { |
110 WmWindow::Windows root_windows = GetAllRootWindows(); | 110 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); |
111 for (WmWindow* root_window : root_windows) { | 111 for (aura::Window* root_window : root_windows) { |
112 if (root_window->GetRootWindowController() | 112 if (RootWindowController::ForWindow(root_window) |
113 ->GetSystemModalLayoutManager(removed) | 113 ->GetSystemModalLayoutManager(removed) |
114 ->ActivateNextModalWindow()) { | 114 ->ActivateNextModalWindow()) { |
115 return; | 115 return; |
116 } | 116 } |
117 } | 117 } |
118 for (WmWindow* root_window : root_windows) { | 118 for (aura::Window* root_window : root_windows) { |
119 root_window->GetRootWindowController() | 119 RootWindowController::ForWindow(root_window) |
120 ->GetSystemModalLayoutManager(removed) | 120 ->GetSystemModalLayoutManager(removed) |
121 ->DestroyModalBackground(); | 121 ->DestroyModalBackground(); |
122 } | 122 } |
123 } | 123 } |
124 | 124 |
125 } // namespace ash | 125 } // namespace ash |
OLD | NEW |