Fixees launcher tooltip animation settings and its finer visibility bugs.

ash/launcher/launcher_view_unittest.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 <vector>
 
 #include "ash/launcher/launcher.h"
@@ skipping 149 matching lines @@
   }
   virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE {
     NOTREACHED();
     return -1;
   }
   virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE {
     return true;
   }
 };
 
-class LauncherViewTest : public aura::test::AuraTestBase {
+class LauncherViewTest : public AshTestBase {
  public:
   LauncherViewTest() {}
   virtual ~LauncherViewTest() {}
 
   virtual void SetUp() OVERRIDE {
-    aura::test::AuraTestBase::SetUp();
+    AshTestBase::SetUp();
 
     model_.reset(new LauncherModel);
 
     launcher_view_.reset(new internal::LauncherView(
         model_.get(), &delegate_, NULL));
     launcher_view_->Init();
     // The bounds should be big enough for 4 buttons + overflow chevron.
     launcher_view_->SetBounds(0, 0, 500, 50);
 
     test_api_.reset(new LauncherViewTestAPI(launcher_view_.get()));
     test_api_->SetAnimationDuration(1);  // Speeds up animation for test.
   }
 
+  virtual void TearDown() OVERRIDE {
+    launcher_view_.reset();
+    AshTestBase::TearDown();
+  }
+
  protected:
   LauncherID AddAppShortcut() {
     LauncherItem item;
     item.type = TYPE_APP_SHORTCUT;
     item.status = STATUS_CLOSED;
 
     LauncherID id = model_->next_id();
     model_->Add(item);
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
@@ skipping 444 matching lines @@
   EXPECT_TRUE(launcher_view_->ShouldHideTooltip(
       gfx::Point(all_area.right(), all_area.y())));
   EXPECT_TRUE(launcher_view_->ShouldHideTooltip(
       gfx::Point(all_area.x() - 1, all_area.y())));
   EXPECT_TRUE(launcher_view_->ShouldHideTooltip(
       gfx::Point(all_area.x(), all_area.y() - 1)));
   EXPECT_TRUE(launcher_view_->ShouldHideTooltip(
       gfx::Point(all_area.x(), all_area.bottom())));
 }
 
+TEST_F(LauncherViewTest, ShouldHideTooltipWithAppListWindowTest) {
+  Shell::GetInstance()->ToggleAppList();
+  ASSERT_TRUE(Shell::GetInstance()->GetAppListWindow());
+
+  // The tooltip shouldn't hide if the mouse is on normal buttons.
+  for (int i = 0; i < test_api_->GetButtonCount() - 1; i++) {
+    internal::LauncherButton* button = test_api_->GetButton(i);
+    EXPECT_FALSE(launcher_view_->ShouldHideTooltip(
+        button->GetMirroredBounds().CenterPoint()))
+        << "LauncherView tries to hide on button " << i;
+  }
+
+  // The tooltip should hide on the app-list button.
+  views::View* app_list_button = launcher_view_->GetAppListButtonView();
+  EXPECT_TRUE(launcher_view_->ShouldHideTooltip(
+      app_list_button->GetMirroredBounds().CenterPoint()));
+}
+
 // Resizing launcher view while an add animation without fade-in is running,
 // which happens when overflow happens. App list button should end up in its
 // new ideal bounds.
 TEST_F(LauncherViewTest, ResizeDuringOverflowAddAnimation) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add buttons until overflow. Let the non-overflow add animations finish but
   // leave the last running.
@@ skipping 16 matching lines @@
   const int app_list_button_index = test_api_->GetButtonCount() - 1;
   const gfx::Rect& app_list_ideal_bounds =
       test_api_->GetIdealBoundsByIndex(app_list_button_index);
   const gfx::Rect& app_list_bounds =
       test_api_->GetBoundsByIndex(app_list_button_index);
   EXPECT_EQ(app_list_bounds, app_list_ideal_bounds);
 }
 
 }  // namespace test
 }  // namespace ash