Prevent title-only panel from fully minimizing when attention is cleared if mouse is in the panel o…

chrome/browser/ui/panels/panel_browsertest.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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 38 matching lines @@
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
 
 class PanelBrowserTest : public BasePanelBrowserTest {
  public:
   PanelBrowserTest() : BasePanelBrowserTest() {
   }
 
  protected:
-  void MoveMouseAndWaitForExpansionStateChange(Panel* panel,
-                                               const gfx::Point& position) {
-    ui_test_utils::WindowedNotificationObserver signal(
-        chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
-        content::Source<Panel>(panel));
-    MoveMouse(position);
-    signal.Wait();
-  }
-
   // Helper function for debugging.
   void PrintAllPanelBounds() {
     const std::vector<Panel*>& panels = PanelManager::GetInstance()->panels();
     DLOG(WARNING) << "PanelBounds:";
     for (size_t i = 0; i < panels.size(); ++i) {
       DLOG(WARNING) << "#=" << i
                     << ", ptr=" << panels[i]
                     << ", x=" << panels[i]->GetBounds().x()
                     << ", y=" << panels[i]->GetBounds().y()
                     << ", width=" << panels[i]->GetBounds().width()
@@ skipping 992 matching lines @@
   panel1->FlashFrame(false);
   EXPECT_FALSE(panel1->IsDrawingAttention());
   EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
 
   // Move mouse away. All panels should return to minimized state.
   hover_point.set_y(hover_point.y() - 200);
   MoveMouseAndWaitForExpansionStateChange(panel1, hover_point);
   EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
   EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
 
+  // Verify minimized panel that is drawing attention stays in title-only mode
+  // after attention is cleared if mouse is in the titlebar area.
+  panel1->FlashFrame(true);
+  EXPECT_TRUE(panel1->IsDrawingAttention());
+  EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+
+  gfx::Point hover_point_in_panel(panel1->GetBounds().origin());
+  MoveMouse(hover_point_in_panel);
+
+  panel1->FlashFrame(false);
+  EXPECT_FALSE(panel1->IsDrawingAttention());
+  EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+  EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
+
+  // Move mouse away and panel should go back to fully minimized state.
+  MoveMouseAndWaitForExpansionStateChange(panel1, hover_point);
+  EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
+  EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
+
   panel1->Close();
   panel2->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhenActive) {
   CreatePanelParams params("Initially Active", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
 
@@ skipping 807 matching lines @@
   // position when tall panel brings up its titlebar.
   CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
   CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }