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.cc | |
| 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.cc')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index d5112c2..a226631 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -260,7 +260,9 @@ class LauncherView::StartFadeAnimationDelegate DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate); }; -LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate) +LauncherView::LauncherView(LauncherModel* model, + LauncherDelegate* delegate, + ShelfLayoutManager* shelf_layout_manager) : model_(model), delegate_(delegate), view_model_(new views::ViewModel), @@ -277,7 +279,7 @@ LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate) bounds_animator_->AddObserver(this); set_context_menu_controller(this); focus_search_.reset(new LauncherFocusSearch(view_model_.get())); - tooltip_.reset(new LauncherTooltipManager(alignment_)); + tooltip_.reset(new LauncherTooltipManager(alignment_, shelf_layout_manager)); } LauncherView::~LauncherView() { |