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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « ash/common/wm/drag_details.cc ('k') | ash/common/wm/lock_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
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 "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->GetShell()->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 (which is always
25 // (which are always above the default container) while a fullscreen 25 // above the default container) while a fullscreen window is open. We only
26 // window is open. We only use the active window when in a switchable 26 // use the active window when in a switchable container as the launcher
27 // container as the launcher should not exit fullscreen mode. 27 // should not exit fullscreen mode.
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)->GetLayerTargetVisibility()) { 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
OLDNEW
« no previous file with comments | « ash/common/wm/drag_details.cc ('k') | ash/common/wm/lock_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698