diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 17:03:31 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 17:03:31 +0000 |
| commit | 8e43cdf424ffc78ed102256b8386b7075edfe661 (patch) | |
| tree | dde4ab1c55830948a7093796e40449a69974f5c6 /ash/wm/shelf_layout_manager.h | |
| parent | 6d17db9e7a87de58b11c79b30d8513cb9532cbf7 (diff) | |
| download | chromium_src-8e43cdf424ffc78ed102256b8386b7075edfe661.zip chromium_src-8e43cdf424ffc78ed102256b8386b7075edfe661.tar.gz chromium_src-8e43cdf424ffc78ed102256b8386b7075edfe661.tar.bz2 | |
Update shelf visibility when lock state changes.
BUG=121230
TEST=Lock screen with window overlapping shelf, and the system tray background will become visible making it readable.
Review URL: https://chromiumcodereview.appspot.com/10382104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.h')
| -rw-r--r-- | ash/wm/shelf_layout_manager.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h index 32b6019..e7101aa 100644 --- a/ash/wm/shelf_layout_manager.h +++ b/ash/wm/shelf_layout_manager.h @@ -8,6 +8,7 @@ #include "ash/ash_export.h" #include "ash/launcher/launcher.h" +#include "ash/shell_observer.h" #include "ash/wm/shelf_auto_hide_behavior.h" #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -38,6 +39,7 @@ class WorkspaceManager; // To respond to bounds changes in the status area StatusAreaLayoutManager works // closely with ShelfLayoutManager. class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager, + public ash::ShellObserver, public aura::WindowObserver { public: enum VisibilityState { @@ -136,6 +138,9 @@ class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager, virtual void SetChildBounds(aura::Window* child, const gfx::Rect& requested_bounds) OVERRIDE; + // Overridden from ash::ShellObserver: + virtual void OnLockStateChanged(bool locked) OVERRIDE; + // Overriden from aura::WindowObserver: virtual void OnWindowPropertyChanged(aura::Window* window, const void* key, |