summaryrefslogtreecommitdiffstats
path: root/ash/wm/shelf_layout_manager.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 04:22:31 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-14 04:22:31 +0000
commitfa404270b07b471ea008520dabaa6db35d7fbe82 (patch)
tree879921a11b375817a1348e187375b34e908978fc /ash/wm/shelf_layout_manager.cc
parent9d33f85ce5de15425824fe9d7d4074e603cda59c (diff)
downloadchromium_src-fa404270b07b471ea008520dabaa6db35d7fbe82.zip
chromium_src-fa404270b07b471ea008520dabaa6db35d7fbe82.tar.gz
chromium_src-fa404270b07b471ea008520dabaa6db35d7fbe82.tar.bz2
Removes caching of whether the launcher should be visible from
StatusAreaWidget and instead queries as necessary. The problem is the current code was caching things based on mouse location, but it wasn't always updating when the mouse moved. Since the shelf has its own mouse handler that queries for state it isn't necessary to duplicate that in the tray. BUG=148548 TEST=see bug R=sadrul@chromium.org Review URL: https://chromiumcodereview.appspot.com/10909220 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.cc')
-rw-r--r--ash/wm/shelf_layout_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index 12a4171..c88d2f1 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -820,7 +820,7 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(
return AUTO_HIDE_SHOWN;
if (shell->status_area_widget() &&
- shell->status_area_widget()->should_show_launcher())
+ shell->status_area_widget()->ShouldShowLauncher())
return AUTO_HIDE_SHOWN;
if (launcher_ && launcher_->IsShowingMenu())