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

Side by Side Diff: ash/screen_util.cc

Issue 2876993002: Introduce window container to be used by lock screen app windows (Closed)
Patch Set: . 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
« no previous file with comments | « ash/screen_util.h ('k') | ash/tray_action/tray_action.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/screen_util.h" 5 #include "ash/screen_util.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_port.h" 10 #include "ash/shell_port.h"
11 #include "ash/wm_window.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "ui/aura/client/screen_position_client.h" 13 #include "ui/aura/client/screen_position_client.h"
13 #include "ui/aura/window_event_dispatcher.h" 14 #include "ui/aura/window_event_dispatcher.h"
14 #include "ui/display/display.h" 15 #include "ui/display/display.h"
15 #include "ui/display/manager/display_manager.h" 16 #include "ui/display/manager/display_manager.h"
16 #include "ui/display/screen.h" 17 #include "ui/display/screen.h"
17 #include "ui/gfx/geometry/size_conversions.h" 18 #include "ui/gfx/geometry/size_conversions.h"
18 #include "ui/wm/core/coordinate_conversion.h" 19 #include "ui/wm/core/coordinate_conversion.h"
19 20
20 namespace ash { 21 namespace ash {
(...skipping 16 matching lines...) Expand all
37 38
38 // static 39 // static
39 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) { 40 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
40 gfx::Rect result = 41 gfx::Rect result =
41 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); 42 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area();
42 ::wm::ConvertRectFromScreen(window->parent(), &result); 43 ::wm::ConvertRectFromScreen(window->parent(), &result);
43 return result; 44 return result;
44 } 45 }
45 46
46 // static 47 // static
48 gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParentForLockScreen(
49 aura::Window* window) {
50 gfx::Rect bounds = Shelf::ForWindow(window)->GetUserWorkAreaBounds();
51 ::wm::ConvertRectFromScreen(window->parent(), &bounds);
52 return bounds;
53 }
54
55 // static
47 gfx::Rect ScreenUtil::GetDisplayBoundsWithShelf(aura::Window* window) { 56 gfx::Rect ScreenUtil::GetDisplayBoundsWithShelf(aura::Window* window) {
48 if (ShellPort::Get()->IsInUnifiedMode()) { 57 if (ShellPort::Get()->IsInUnifiedMode()) {
49 // In unified desktop mode, there is only one shelf in the first display. 58 // In unified desktop mode, there is only one shelf in the first display.
50 gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size()); 59 gfx::SizeF size(ShellPort::Get()->GetFirstDisplay().size());
51 float scale = window->GetRootWindow()->bounds().height() / size.height(); 60 float scale = window->GetRootWindow()->bounds().height() / size.height();
52 size.Scale(scale, scale); 61 size.Scale(scale, scale);
53 return gfx::Rect(gfx::ToCeiledSize(size)); 62 return gfx::Rect(gfx::ToCeiledSize(size));
54 } 63 }
55 64
56 return window->GetRootWindow()->bounds(); 65 return window->GetRootWindow()->bounds();
57 } 66 }
58 67
59 } // namespace ash 68 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screen_util.h ('k') | ash/tray_action/tray_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698