diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 04:38:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 04:38:03 +0000 |
| commit | d9d5a92e8cf612cf50abb4414bbcf94cab105f66 (patch) | |
| tree | 23ecccf5f71b5cd6c9de80413fbeb9dd5fce96d9 /ash/wm | |
| parent | 584a15d7c30d860010f7104974f79ec5acc3c645 (diff) | |
| download | chromium_src-d9d5a92e8cf612cf50abb4414bbcf94cab105f66.zip chromium_src-d9d5a92e8cf612cf50abb4414bbcf94cab105f66.tar.gz chromium_src-d9d5a92e8cf612cf50abb4414bbcf94cab105f66.tar.bz2 | |
Changes logic of when launcher should be shown so that if a status
bubble is initiated without the mouse over the status area the
launcher doesn't show. This is to handle the case of hitting
brightness keys while mouse isn't over the status area.
BUG=119765
TEST=see bug
R=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9809005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/shelf_layout_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index ed34975..951fa73 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -365,8 +365,8 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState( return AUTO_HIDE_HIDDEN; Shell* shell = Shell::GetInstance(); - if (shell->tray() && shell->tray()->showing_bubble()) - return AUTO_HIDE_SHOWN; // Always show if a bubble is open from the shelf. + if (shell->tray() && shell->tray()->should_show_launcher()) + return AUTO_HIDE_SHOWN; aura::RootWindow* root = launcher_widget()->GetNativeView()->GetRootWindow(); bool mouse_over_launcher = |