Polish launcher tooltip visibility (2nd try).

Previous patch has broken win_aura build so reverted. This also fixes the build breaks.

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/10701051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145837 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index f8314bc..bc879e7 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -95,7 +95,8 @@ void Launcher::DelegateView::Layout() {
 
 // Launcher --------------------------------------------------------------------
 
-Launcher::Launcher(aura::Window* window_container)
+Launcher::Launcher(aura::Window* window_container,
+                   internal::ShelfLayoutManager* shelf_layout_manager)
     : widget_(NULL),
       window_container_(window_container),
       delegate_view_(NULL),
@@ -119,7 +120,8 @@ Launcher::Launcher(aura::Window* window_container)
   params.parent = Shell::GetContainer(
       window_container_->GetRootWindow(),
       ash::internal::kShellWindowId_LauncherContainer);
-  launcher_view_ = new internal::LauncherView(model_.get(), delegate_.get());
+  launcher_view_ = new internal::LauncherView(
+      model_.get(), delegate_.get(), shelf_layout_manager);
   launcher_view_->Init();
   delegate_view_ = new DelegateView(this);
   delegate_view_->AddChildView(launcher_view_);