From 0c4011b93ad687c5087589a04220b804d086acbe Mon Sep 17 00:00:00 2001 From: "derat@chromium.org" Date: Sat, 11 Feb 2012 02:10:42 +0000 Subject: aura: Update status area position in compact mode. This makes us adjust the position of the status area when it compact mode depending on whether we're currently showing the login/lock screen or not. BUG=113001 TEST=added; also did manual testing Review URL: http://codereview.chromium.org/9379024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121616 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'ash/shell.h') diff --git a/ash/shell.h b/ash/shell.h index 853f2e1..833cfee 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -15,6 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" +#include "ui/gfx/size.h" class CommandLine; @@ -26,7 +27,6 @@ class Window; namespace gfx { class Point; class Rect; -class Size; } namespace views { class NonClientFrameView; @@ -89,6 +89,10 @@ class ASH_EXPORT Shell { static void DeleteInstance(); + const gfx::Size& compact_status_area_offset() const { + return compact_status_area_offset_; + } + aura::Window* GetContainer(int container_id); const aura::Window* GetContainer(int container_id) const; @@ -120,6 +124,10 @@ class ASH_EXPORT Shell { // See enum WindowMode for details. bool IsWindowModeCompact() const { return window_mode_ == MODE_COMPACT; } + // Sets the offset between the corner of the status area and the corner of the + // screen when we're using the compact window mode. + void SetCompactStatusAreaOffset(gfx::Size& offset); + // Creates a default views::NonClientFrameView for use by windows in the // Ash environment. views::NonClientFrameView* CreateDefaultNonClientFrameView( @@ -237,6 +245,10 @@ class ASH_EXPORT Shell { // Locks shell to overlapping window mode despite host window size. static bool window_mode_overlapping_for_test_; + // Offset between the corner of the status area and the corner of the screen + // when in the compact window mode. + gfx::Size compact_status_area_offset_; + DISALLOW_COPY_AND_ASSIGN(Shell); }; -- cgit v1.1