diff options
author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 18:01:23 +0000 |
---|---|---|
committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 18:01:23 +0000 |
commit | 403dc94ea7160dd133f262cf504e5a07ec1e50b6 (patch) | |
tree | 79741798b0f408e12d47eb4ebc5f15b6fe96c94f /ash/launcher/launcher_view.h | |
parent | 38b80bbab9db5a423cace41e4e7757eb4f27806c (diff) | |
download | chromium_src-403dc94ea7160dd133f262cf504e5a07ec1e50b6.zip chromium_src-403dc94ea7160dd133f262cf504e5a07ec1e50b6.tar.gz chromium_src-403dc94ea7160dd133f262cf504e5a07ec1e50b6.tar.bz2 |
Polish launcher tooltip visibility.
Add ShelfLayoutManager::Observer for two cases:
- AutoHide: catches the auto hiding status to close the tooltip property
- FullScreen: catches the shelf visibility changes to close it too
Check the visibility of Shelf itself in case of tooltip showing. Then the toolip
won't show if the shelf is hidden.
R=derat@chromium.org,davemoore@chromium.org
BUG=133551
TEST=manually done on lumpy, made sure aura_shell_unittests passed
Review URL: https://chromiumcodereview.appspot.com/10700030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_view.h')
-rw-r--r-- | ash/launcher/launcher_view.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h index 1db7a6b..1c61fca 100644 --- a/ash/launcher/launcher_view.h +++ b/ash/launcher/launcher_view.h @@ -41,6 +41,7 @@ namespace internal { class LauncherButton; class LauncherTooltipManager; +class ShelfLayoutManager; class ASH_EXPORT LauncherView : public views::View, public LauncherModelObserver, @@ -50,7 +51,9 @@ class ASH_EXPORT LauncherView : public views::View, public views::FocusTraversable, public views::BoundsAnimatorObserver { public: - LauncherView(LauncherModel* model, LauncherDelegate* delegate); + LauncherView(LauncherModel* model, + LauncherDelegate* delegate, + ShelfLayoutManager* shelf_layout_manager); virtual ~LauncherView(); LauncherTooltipManager* tooltip_manager() { return tooltip_.get(); } |