Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: ash/common/wm/fullscreen_window_finder.cc

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: merge Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/wm/switchable_windows.h" 7 #include "ash/common/wm/switchable_windows.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
James Cook 2017/03/31 19:29:52 nit: still needed?
sky 2017/03/31 20:15:14 Done.
10 #include "ash/common/wm_window.h" 10 #include "ash/common/wm_window.h"
11 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
12 #include "ash/wm/window_util.h"
12 #include "ui/compositor/layer.h" 13 #include "ui/compositor/layer.h"
13 14
14 namespace ash { 15 namespace ash {
15 namespace wm { 16 namespace wm {
16 17
17 WmWindow* GetWindowForFullscreenMode(WmWindow* context) { 18 WmWindow* GetWindowForFullscreenMode(WmWindow* context) {
18 WmWindow* topmost_window = nullptr; 19 WmWindow* topmost_window = nullptr;
19 WmWindow* active_window = context->GetShell()->GetActiveWindow(); 20 WmWindow* active_window = WmWindow::Get(GetActiveWindow());
20 if (active_window && 21 if (active_window &&
21 active_window->GetRootWindow() == context->GetRootWindow() && 22 active_window->GetRootWindow() == context->GetRootWindow() &&
22 IsSwitchableContainer(active_window->GetParent())) { 23 IsSwitchableContainer(active_window->GetParent())) {
23 // Use the active window when it is on the current root window to determine 24 // Use the active window when it is on the current root window to determine
24 // the fullscreen state to allow temporarily using a panel (which is always 25 // the fullscreen state to allow temporarily using a panel (which is always
25 // above the default container) while a fullscreen window is open. We only 26 // above the default container) while a fullscreen window is open. We only
26 // use the active window when in a switchable container as the launcher 27 // use the active window when in a switchable container as the launcher
27 // should not exit fullscreen mode. 28 // should not exit fullscreen mode.
28 topmost_window = active_window; 29 topmost_window = active_window;
29 } else { 30 } else {
(...skipping 14 matching lines...) Expand all
44 while (topmost_window) { 45 while (topmost_window) {
45 if (topmost_window->GetWindowState()->IsFullscreen()) 46 if (topmost_window->GetWindowState()->IsFullscreen())
46 return topmost_window; 47 return topmost_window;
47 topmost_window = topmost_window->GetTransientParent(); 48 topmost_window = topmost_window->GetTransientParent();
48 } 49 }
49 return nullptr; 50 return nullptr;
50 } 51 }
51 52
52 } // namespace wm 53 } // namespace wm
53 } // namespace ash 54 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698