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/wm_globals.h" | 10 #include "ash/common/wm_shell.h" |
11 #include "ash/common/wm/wm_window.h" | 11 #include "ash/common/wm_window.h" |
12 #include "ui/compositor/layer.h" | 12 #include "ui/compositor/layer.h" |
13 | 13 |
14 namespace ash { | 14 namespace ash { |
15 namespace wm { | 15 namespace wm { |
16 | 16 |
17 WmWindow* GetWindowForFullscreenMode(WmWindow* context) { | 17 WmWindow* GetWindowForFullscreenMode(WmWindow* context) { |
18 WmWindow* topmost_window = nullptr; | 18 WmWindow* topmost_window = nullptr; |
19 WmWindow* active_window = context->GetGlobals()->GetActiveWindow(); | 19 WmWindow* active_window = context->GetShell()->GetActiveWindow(); |
20 if (active_window && | 20 if (active_window && |
21 active_window->GetRootWindow() == context->GetRootWindow() && | 21 active_window->GetRootWindow() == context->GetRootWindow() && |
22 IsSwitchableContainer(active_window->GetParent())) { | 22 IsSwitchableContainer(active_window->GetParent())) { |
23 // Use the active window when it is on the current root window to determine | 23 // Use the active window when it is on the current root window to determine |
24 // the fullscreen state to allow temporarily using a panel or docked window | 24 // the fullscreen state to allow temporarily using a panel or docked window |
25 // (which are always above the default container) while a fullscreen | 25 // (which are always above the default container) while a fullscreen |
26 // window is open. We only use the active window when in a switchable | 26 // window is open. We only use the active window when in a switchable |
27 // container as the launcher should not exit fullscreen mode. | 27 // container as the launcher should not exit fullscreen mode. |
28 topmost_window = active_window; | 28 topmost_window = active_window; |
29 } else { | 29 } else { |
(...skipping 14 matching lines...) Expand all Loading... |
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 |