Polish launcher tooltip visibility (2nd try).

ash/launcher/launcher_tooltip_manager.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_tooltip_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
+#include "base/bind.h"
+#include "base/message_loop.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "ui/aura/window.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
@@ skipping 49 matching lines @@
   set_close_on_esc(false);
   set_close_on_deactivate(false);
   set_use_focusless(true);
   set_margin(kTooltipMargin);
   SetLayoutManager(new views::FillLayout());
   // The anchor may not have the widget in tests.
   if (anchor->GetWidget() && anchor->GetWidget()->GetNativeView()) {
     aura::RootWindow* root_window =
         anchor->GetWidget()->GetNativeView()->GetRootWindow();
     set_parent_window(ash::Shell::GetInstance()->GetContainer(
-        root_window, ash::internal::kShellWindowId_SettingBubbleContainer));
+        root_window, ash::internal::kShellWindowId_LauncherContainer));
   }
   label_ = new views::Label;
   label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label_);
 }
 
 void LauncherTooltipManager::LauncherTooltipBubble::SetText(
     const string16& text) {
   label_->SetText(text);
   label_->SetMultiLine(true);
   label_->SizeToFit(kTooltipMaxWidth);
   SizeToContents();
 }
 
 void LauncherTooltipManager::LauncherTooltipBubble::OnMouseExited(
     const views::MouseEvent& event) {
   GetWidget()->Close();
   host_->OnBubbleClosed(this);
 }
 
 void LauncherTooltipManager::LauncherTooltipBubble::WindowClosing() {
   views::BubbleDelegateView::WindowClosing();
   host_->OnBubbleClosed(this);
 }
 
-LauncherTooltipManager::LauncherTooltipManager(ShelfAlignment alignment)
+LauncherTooltipManager::LauncherTooltipManager(
+    ShelfAlignment alignment, ShelfLayoutManager* shelf_layout_manager)
     : view_(NULL),
       anchor_(NULL),
-      alignment_(alignment) {}
+      alignment_(alignment),
+      shelf_layout_manager_(shelf_layout_manager) {
+  if (shelf_layout_manager)
+    shelf_layout_manager->AddObserver(this);
+}
 
 LauncherTooltipManager::~LauncherTooltipManager() {
   Close();
+  if (shelf_layout_manager_)
+    shelf_layout_manager_->RemoveObserver(this);
 }
 
 void LauncherTooltipManager::ShowDelayed(views::View* anchor,
                                          const string16& text) {
   if (view_) {
     if (timer_.get() && timer_->IsRunning())
       return;
     else
       Close();
   }
 
+  if (shelf_layout_manager_ && !shelf_layout_manager_->IsVisible())
+    return;
+
   CreateBubble(anchor, text);
   gfx::NativeView native_view = view_->GetWidget()->GetNativeView();
   SetWindowVisibilityAnimationType(
       native_view, WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
   SetWindowVisibilityAnimationTransition(native_view, ANIMATE_SHOW);
   ResetTimer();
 }
 
 void LauncherTooltipManager::ShowImmediately(views::View* anchor,
                                              const string16& text) {
-  if (view_ && IsVisible())
-      Close();
+  if (view_) {
+    if (timer_.get() && timer_->IsRunning())
+      StopTimer();
+    Close();
+  }
+
+  if (shelf_layout_manager_ && !shelf_layout_manager_->IsVisible())
+    return;
 
   CreateBubble(anchor, text);
   gfx::NativeView native_view = view_->GetWidget()->GetNativeView();
   SetWindowVisibilityAnimationTransition(native_view, ANIMATE_NONE);
   ShowInternal();
 }
 
 void LauncherTooltipManager::Close() {
   if (view_) {
     view_->GetWidget()->Close();
@@ skipping 17 matching lines @@
     ShowImmediately(anchor_, text_);
   }
 }
 
 void LauncherTooltipManager::ResetTimer() {
   if (timer_.get() && timer_->IsRunning()) {
     timer_->Reset();
     return;
   }
 
+  // We don't start the timer if the shelf isn't visible.
+  if (shelf_layout_manager_ && !shelf_layout_manager_->IsVisible())
+    return;
+
   base::OneShotTimer<LauncherTooltipManager>* new_timer =
       new base::OneShotTimer<LauncherTooltipManager>();
   new_timer->Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTooltipAppearanceDelay),
       this,
       &LauncherTooltipManager::ShowInternal);
   timer_.reset(new_timer);
 }
 
 void LauncherTooltipManager::StopTimer() {
   timer_.reset();
 }
 
 bool LauncherTooltipManager::IsVisible() {
   if (timer_.get() && timer_->IsRunning())
     return false;
 
   return view_ && view_->GetWidget() && view_->GetWidget()->IsVisible();
 }
 
+void LauncherTooltipManager::WillDeleteShelf() {
+  shelf_layout_manager_ = NULL;
+}
+
+void LauncherTooltipManager::WillChangeVisibilityState(
+    ShelfLayoutManager::VisibilityState new_state) {
+  if (new_state == ShelfLayoutManager::HIDDEN) {
+    StopTimer();
+    Close();
+  }
+}
+
+void LauncherTooltipManager::OnAutoHideStateChanged(
+    ShelfLayoutManager::AutoHideState new_state) {
+  if (new_state == ShelfLayoutManager::AUTO_HIDE_HIDDEN) {
+    StopTimer();
+    // AutoHide state change happens during an event filter, so immediate close
+    // may cause a crash in the HandleMouseEvent() after the filter.  So we just
+    // schedule the Close here.
+    MessageLoopForUI::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&LauncherTooltipManager::Close, base::Unretained(this)));
+  }
+}
+
 void LauncherTooltipManager::ShowInternal() {
   if (view_)
     view_->Show();
 
   timer_.reset();
 }
 
 void LauncherTooltipManager::CreateBubble(views::View* anchor,
                                           const string16& text) {
   DCHECK(!view_);
 
   anchor_ = anchor;
   text_ = text;
   view_ = new LauncherTooltipBubble(
       anchor, GetArrowLocation(alignment_), this);
   views::BubbleDelegateView::CreateBubble(view_);
   view_->SetText(text_);
 }
 
 }  // namespace internal
 }  // namespace ash