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

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

Issue 1923983003: Makes WorkspaceLayoutManager use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix always-on-top and remove mus changes Created 4 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/common/wm_screen_util.h" 5 #include "ash/wm/common/wm_screen_util.h"
6 6
7 #include "ash/wm/common/wm_root_window_controller.h" 7 #include "ash/wm/common/wm_root_window_controller.h"
8 #include "ash/wm/common/wm_window.h" 8 #include "ash/wm/common/wm_window.h"
9 #include "ui/display/display.h" 9 #include "ui/display/display.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace wm { 12 namespace wm {
13 13
14 gfx::Rect GetDisplayWorkAreaBoundsInParent(WmWindow* window) { 14 gfx::Rect GetDisplayWorkAreaBoundsInParent(WmWindow* window) {
15 return GetDisplayWorkAreaBounds(window->GetParent());
16 }
17
18 gfx::Rect GetDisplayWorkAreaBounds(WmWindow* window) {
15 display::Display display = window->GetDisplayNearestWindow(); 19 display::Display display = window->GetDisplayNearestWindow();
16 return window->GetParent()->ConvertRectFromScreen(display.work_area()); 20 return window->GetParent()->ConvertRectFromScreen(display.work_area());
17 } 21 }
18 22
19 gfx::Rect GetDisplayBoundsInParent(WmWindow* window) { 23 gfx::Rect GetDisplayBoundsInParent(WmWindow* window) {
20 display::Display display = window->GetDisplayNearestWindow(); 24 display::Display display = window->GetDisplayNearestWindow();
21 return window->GetParent()->ConvertRectFromScreen(display.bounds()); 25 return window->GetParent()->ConvertRectFromScreen(display.bounds());
22 } 26 }
23 27
24 gfx::Rect GetMaximizedWindowBoundsInParent(WmWindow* window) { 28 gfx::Rect GetMaximizedWindowBoundsInParent(WmWindow* window) {
25 if (window->GetRootWindowController()->HasShelf()) 29 if (window->GetRootWindowController()->HasShelf())
26 return GetDisplayWorkAreaBoundsInParent(window); 30 return GetDisplayWorkAreaBoundsInParent(window);
27 31
28 return GetDisplayBoundsInParent(window); 32 return GetDisplayBoundsInParent(window);
29 } 33 }
30 34
31 } // namespace wm 35 } // namespace wm
32 } // namespace ash 36 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698