diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 20:38:50 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 20:38:50 +0000 |
commit | 40429f0f1c24d8be2997376c324f15ddc8e398bd (patch) | |
tree | 7911e6365d66aa32ee10f442c00a50b4f16cfb09 /ash/wm/shelf_layout_manager.cc | |
parent | 9dcd3e08a3e777be291f7c62d5f82b5b975c17ed (diff) | |
download | chromium_src-40429f0f1c24d8be2997376c324f15ddc8e398bd.zip chromium_src-40429f0f1c24d8be2997376c324f15ddc8e398bd.tar.gz chromium_src-40429f0f1c24d8be2997376c324f15ddc8e398bd.tar.bz2 |
ash: Do not show the arrow in the tray bubbles when the tray isn't visible.
BUG=120140
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9873020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.cc')
-rw-r--r-- | ash/wm/shelf_layout_manager.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index 6af5daf..2e17bbf 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -124,6 +124,12 @@ void ShelfLayoutManager::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) { UpdateVisibilityState(); } +bool ShelfLayoutManager::IsVisible() const { + return state_.visibility_state == VISIBLE || + (state_.visibility_state == AUTO_HIDE && + state_.auto_hide_state == AUTO_HIDE_SHOWN); +} + gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds( aura::Window* window) const { // TODO: needs to be multi-mon aware. |