Fixees launcher tooltip animation settings and its finer visibility bugs.

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/launcher/launcher_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
@@ skipping 40 matching lines @@
     : public views::BubbleDelegateView {
  public:
   LauncherTooltipBubble(views::View* anchor,
                         views::BubbleBorder::ArrowLocation arrow_location,
                         LauncherTooltipManager* host);
 
   void SetText(const string16& text);
   void Close();
 
  private:
-  // views::WidgetDelegate overrides;
+  // views::WidgetDelegate overrides:
   virtual void WindowClosing() OVERRIDE;
 
   LauncherTooltipManager* host_;
   views::Label* label_;
 };
 
 LauncherTooltipManager::LauncherTooltipBubble::LauncherTooltipBubble(
     views::View* anchor,
     views::BubbleBorder::ArrowLocation arrow_location,
     LauncherTooltipManager* host)
     : views::BubbleDelegateView(anchor, arrow_location),
       host_(host) {
   set_close_on_esc(false);
   set_close_on_deactivate(false);
   set_use_focusless(true);
   set_margins(gfx::Insets(kTooltipMargin, kTooltipMargin, kTooltipMargin,
                           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_LauncherContainer));
+        root_window, ash::internal::kShellWindowId_SettingBubbleContainer));
   }
   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);
@@ skipping 24 matching lines @@
       alignment_(alignment),
       shelf_layout_manager_(shelf_layout_manager),
       launcher_view_(launcher_view) {
   if (shelf_layout_manager)
     shelf_layout_manager->AddObserver(this);
   if (Shell::HasInstance())
     Shell::GetInstance()->AddEnvEventFilter(this);
 }
 
 LauncherTooltipManager::~LauncherTooltipManager() {
+  CancelHidingAnimation();
   Close();
   if (shelf_layout_manager_)
     shelf_layout_manager_->RemoveObserver(this);
   if (Shell::HasInstance())
     Shell::GetInstance()->RemoveEnvEventFilter(this);
 }
 
 void LauncherTooltipManager::ShowDelayed(views::View* anchor,
                                          const string16& text) {
   if (view_) {
     if (timer_.get() && timer_->IsRunning())
       return;
-    else
+    else {
+      CancelHidingAnimation();
       Close();
+    }
   }
 
   if (shelf_layout_manager_ && !shelf_layout_manager_->IsVisible())
     return;
 
   CreateBubble(anchor, text);
-  gfx::NativeView native_view = widget_->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_) {
     if (timer_.get() && timer_->IsRunning())
       StopTimer();
+    CancelHidingAnimation();
     Close();
   }
 
   if (shelf_layout_manager_ && !shelf_layout_manager_->IsVisible())
     return;
 
   CreateBubble(anchor, text);
-  gfx::NativeView native_view = widget_->GetNativeView();
-  SetWindowVisibilityAnimationTransition(native_view, ANIMATE_NONE);
   ShowInternal();
 }
 
 void LauncherTooltipManager::Close() {
+  StopTimer();
   if (view_) {
     view_->Close();
     view_ = NULL;
     widget_ = NULL;
   }
 }
 
 void LauncherTooltipManager::OnBubbleClosed(views::BubbleDelegateView* view) {
   if (view == view_) {
     view_ = NULL;
     widget_ = NULL;
   }
 }
 
 void LauncherTooltipManager::SetArrowLocation(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   alignment_ = alignment;
   if (view_) {
+    CancelHidingAnimation();
     Close();
     ShowImmediately(anchor_, text_);
   }
 }
 
 void LauncherTooltipManager::ResetTimer() {
   if (timer_.get() && timer_->IsRunning()) {
     timer_->Reset();
     return;
   }
@@ skipping 98 matching lines @@
     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.
     CloseSoon();
   }
 }
 
+void LauncherTooltipManager::CancelHidingAnimation() {
+  if (!widget_ || !widget_->GetNativeView())
+    return;
+
+  gfx::NativeView native_view = widget_->GetNativeView();
+  SetWindowVisibilityAnimationTransition(native_view, ANIMATE_NONE);
+}
+
 void LauncherTooltipManager::CloseSoon() {
   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_);
   widget_ = view_->GetWidget();
   view_->SetText(text_);
+
+  gfx::NativeView native_view = widget_->GetNativeView();
+  SetWindowVisibilityAnimationType(
+      native_view, WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+  SetWindowVisibilityAnimationTransition(native_view, ANIMATE_HIDE);
 }
 
 }  // namespace internal
 }  // namespace ash