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

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

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: moar Created 3 years, 7 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/wm/fullscreen_window_finder.h" 5 #include "ash/wm/fullscreen_window_finder.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/wm/switchable_windows.h" 8 #include "ash/wm/switchable_windows.h"
9 #include "ash/wm/window_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_state_aura.h"
10 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
11 #include "ash/wm_window.h" 12 #include "ui/aura/window.h"
12 #include "ui/compositor/layer.h" 13 #include "ui/compositor/layer.h"
14 #include "ui/wm/core/window_util.h"
13 15
14 namespace ash { 16 namespace ash {
15 namespace wm { 17 namespace wm {
16 18
17 WmWindow* GetWindowForFullscreenMode(WmWindow* context) { 19 aura::Window* GetWindowForFullscreenMode(aura::Window* context) {
18 WmWindow* topmost_window = nullptr; 20 aura::Window* topmost_window = nullptr;
19 WmWindow* active_window = WmWindow::Get(GetActiveWindow()); 21 aura::Window* active_window = GetActiveWindow();
20 if (active_window && 22 if (active_window &&
21 active_window->GetRootWindow() == context->GetRootWindow() && 23 active_window->GetRootWindow() == context->GetRootWindow() &&
22 IsSwitchableContainer(active_window->GetParent())) { 24 IsSwitchableContainer(active_window->parent())) {
23 // Use the active window when it is on the current root window to determine 25 // 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 26 // 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 27 // 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 28 // use the active window when in a switchable container as the launcher
27 // should not exit fullscreen mode. 29 // should not exit fullscreen mode.
28 topmost_window = active_window; 30 topmost_window = active_window;
29 } else { 31 } else {
30 // Otherwise, use the topmost window on the root window's default container 32 // Otherwise, use the topmost window on the root window's default container
31 // when there is no active window on this root window. 33 // when there is no active window on this root window.
32 std::vector<WmWindow*> windows = 34 const std::vector<aura::Window*>& windows =
33 context->GetRootWindow() 35 context->GetRootWindow()
34 ->GetChildByShellWindowId(kShellWindowId_DefaultContainer) 36 ->GetChildById(kShellWindowId_DefaultContainer)
35 ->GetChildren(); 37 ->children();
36 for (auto iter = windows.rbegin(); iter != windows.rend(); ++iter) { 38 for (auto iter = windows.rbegin(); iter != windows.rend(); ++iter) {
37 if ((*iter)->GetWindowState()->IsUserPositionable() && 39 if (GetWindowState((*iter))->IsUserPositionable() &&
msw 2017/05/05 23:48:06 nit: remove extra parens
sky 2017/05/08 15:16:37 Done.
38 (*iter)->GetLayerTargetVisibility()) { 40 (*iter)->layer()->GetTargetVisibility()) {
39 topmost_window = *iter; 41 topmost_window = *iter;
40 break; 42 break;
41 } 43 }
42 } 44 }
43 } 45 }
44 while (topmost_window) { 46 while (topmost_window) {
45 if (topmost_window->GetWindowState()->IsFullscreen()) 47 if (GetWindowState(topmost_window)->IsFullscreen())
46 return topmost_window; 48 return topmost_window;
47 topmost_window = topmost_window->GetTransientParent(); 49 topmost_window = ::wm::GetTransientParent(topmost_window);
48 } 50 }
49 return nullptr; 51 return nullptr;
50 } 52 }
51 53
52 } // namespace wm 54 } // namespace wm
53 } // namespace ash 55 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698