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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/screen_util.h ('k') | ash/tray_action/tray_action.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_util.cc
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index 1b674ebd37eadb88e2c691a80f3564cc8a206949..d054568a2fcbbbf89861c690f610c3a626fe1ba1 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -8,6 +8,7 @@
#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
+#include "ash/wm_window.h"
#include "base/logging.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -44,6 +45,14 @@ gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
}
// static
+gfx::Rect ScreenUtil::GetDisplayWorkAreaBoundsInParentForLockScreen(
+ aura::Window* window) {
+ gfx::Rect bounds = Shelf::ForWindow(window)->GetUserWorkAreaBounds();
+ ::wm::ConvertRectFromScreen(window->parent(), &bounds);
+ return bounds;
+}
+
+// static
gfx::Rect ScreenUtil::GetDisplayBoundsWithShelf(aura::Window* window) {
if (ShellPort::Get()->IsInUnifiedMode()) {
// In unified desktop mode, there is only one shelf in the first display.
« 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