Polish launcher tooltip visibility (2nd try).

ash/launcher/launcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher.h"
 
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_navigator.h"
@@ skipping 77 matching lines @@
     int w = std::max(0, width() - launcher_->status_size_.width());
     child_at(0)->SetBounds(0, 0, w, height());
   } else {
     int h = std::max(0, height() - launcher_->status_size_.height());
     child_at(0)->SetBounds(0, 0, width(), h);
   }
 }
 
 // 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),
       launcher_view_(NULL),
       alignment_(SHELF_ALIGNMENT_BOTTOM),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           background_animator_(this, 0, kBackgroundAlpha)) {
   model_.reset(new LauncherModel);
   if (Shell::GetInstance()->delegate()) {
     delegate_.reset(
         Shell::GetInstance()->delegate()->CreateLauncherDelegate(model_.get()));
   }
 
   widget_.reset(new views::Widget);
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   // The launcher only ever draws a solid color.
   params.layer_type = ui::LAYER_SOLID_COLOR;
   params.transparent = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   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_);
   params.delegate = delegate_view_;
   widget_->Init(params);
   widget_->GetNativeWindow()->SetName("LauncherWindow");
   gfx::Size pref =
       static_cast<views::View*>(launcher_view_)->GetPreferredSize();
   widget_->SetBounds(gfx::Rect(pref));
   // The launcher should not take focus when it is initially shown.
@@ skipping 83 matching lines @@
 internal::LauncherView* Launcher::GetLauncherViewForTest() {
   return launcher_view_;
 }
 
 void Launcher::UpdateBackground(int alpha) {
   ui::Layer* layer = widget_->GetNativeView()->layer();
   layer->SetColor(SkColorSetARGB(alpha, 0, 0, 0));
 }
 
 }  // namespace ash