| 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/common/wm/fullscreen_window_finder.h" | 5 #include "ash/common/wm/fullscreen_window_finder.h" |
| 6 | 6 |
| 7 #include "ash/common/shell_window_ids.h" | 7 #include "ash/common/shell_window_ids.h" |
| 8 #include "ash/common/wm/switchable_windows.h" | 8 #include "ash/common/wm/switchable_windows.h" |
| 9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 topmost_window = active_window; | 28 topmost_window = active_window; |
| 29 } else { | 29 } else { |
| 30 // Otherwise, use the topmost window on the root window's default container | 30 // Otherwise, use the topmost window on the root window's default container |
| 31 // when there is no active window on this root window. | 31 // when there is no active window on this root window. |
| 32 std::vector<WmWindow*> windows = | 32 std::vector<WmWindow*> windows = |
| 33 context->GetRootWindow() | 33 context->GetRootWindow() |
| 34 ->GetChildByShellWindowId(kShellWindowId_DefaultContainer) | 34 ->GetChildByShellWindowId(kShellWindowId_DefaultContainer) |
| 35 ->GetChildren(); | 35 ->GetChildren(); |
| 36 for (auto iter = windows.rbegin(); iter != windows.rend(); ++iter) { | 36 for (auto iter = windows.rbegin(); iter != windows.rend(); ++iter) { |
| 37 if ((*iter)->GetWindowState()->IsUserPositionable() && | 37 if ((*iter)->GetWindowState()->IsUserPositionable() && |
| 38 (*iter)->GetLayer()->GetTargetVisibility()) { | 38 (*iter)->GetLayerTargetVisibility()) { |
| 39 topmost_window = *iter; | 39 topmost_window = *iter; |
| 40 break; | 40 break; |
| 41 } | 41 } |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 while (topmost_window) { | 44 while (topmost_window) { |
| 45 if (topmost_window->GetWindowState()->IsFullscreen()) | 45 if (topmost_window->GetWindowState()->IsFullscreen()) |
| 46 return topmost_window; | 46 return topmost_window; |
| 47 topmost_window = topmost_window->GetTransientParent(); | 47 topmost_window = topmost_window->GetTransientParent(); |
| 48 } | 48 } |
| 49 return nullptr; | 49 return nullptr; |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace wm | 52 } // namespace wm |
| 53 } // namespace ash | 53 } // namespace ash |
| OLD | NEW |