Fixees launcher tooltip animation settings and its finer visibility bugs.

ash/launcher/launcher_view.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_view.h"
 
 #include <algorithm>
 
 #include "ash/launcher/app_list_button.h"
 #include "ash/launcher/launcher_button.h"
@@ skipping 734 matching lines @@
 }
 
 bool LauncherView::ShouldHideTooltip(const gfx::Point& cursor_location) {
   gfx::Rect active_bounds;
 
   for (int i = 0; i < child_count(); ++i) {
     views::View* child = child_at(i);
     if (child == overflow_button_)
       continue;
 
+    // The tooltip shouldn't show over the app-list window.
+    if (child == GetAppListButtonView() &&
+        Shell::GetInstance()->GetAppListWindow())
+      continue;
+
     gfx::Rect child_bounds = child->GetMirroredBounds();
     active_bounds = active_bounds.Union(child_bounds);
   }
 
   return !active_bounds.Contains(cursor_location);
 }
 
 int LauncherView::CancelDrag(int modified_index) {
   if (!drag_view_)
     return modified_index;
@@ skipping 182 matching lines @@
   if (canceled) {
     CancelDrag(-1);
   } else if (drag_pointer_ == pointer) {
     drag_pointer_ = NONE;
     drag_view_ = NULL;
     AnimateToIdealBounds();
   }
 }
 
 void LauncherView::MouseMovedOverButton(views::View* view) {
+  // Mouse cursor moves doesn't make effects on the app-list button if
+  // app-list bubble is already visible.
+  if (view == GetAppListButtonView() &&
+      Shell::GetInstance()->GetAppListWindow())
+    return;
+
   if (!tooltip_->IsVisible())
     tooltip_->ResetTimer();
 }
 
 void LauncherView::MouseEnteredButton(views::View* view) {
+  // If mouse cursor enters to the app-list button but app-list bubble is
+  // already visible, we should not show the bubble in that case.
+  if (view == GetAppListButtonView() &&
+      Shell::GetInstance()->GetAppListWindow())
+    return;
+
   if (tooltip_->IsVisible()) {
-    tooltip_->Close();
     tooltip_->ShowImmediately(view, GetAccessibleName(view));
   } else {
     tooltip_->ShowDelayed(view, GetAccessibleName(view));
   }
 }
 
 void LauncherView::MouseExitedButton(views::View* view) {
   if (!tooltip_->IsVisible())
     tooltip_->StopTimer();
 }
@@ skipping 37 matching lines @@
     return;
   }
 
   if (!delegate_)
     return;
   int view_index = view_model_->GetIndexOfView(sender);
   // May be -1 while in the process of animating closed.
   if (view_index == -1)
     return;
 
+  tooltip_->Close();
   switch (model_->items()[view_index].type) {
     case TYPE_TABBED:
     case TYPE_APP_PANEL:
     case TYPE_APP_SHORTCUT:
     case TYPE_PLATFORM_APP:
       delegate_->ItemClicked(model_->items()[view_index], event.flags());
       break;
 
     case TYPE_APP_LIST:
       Shell::GetInstance()->ToggleAppList();
@@ skipping 46 matching lines @@
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
                     OnLauncherIconPositionsChanged());
   PreferredSizeChanged();
 }
 
 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
 }
 
 }  // namespace internal
 }  // namespace ash