Align expanded panel to the bottom of screen edge when there is an auto-hiding taskbar

chrome/browser/ui/panels/panel_browser_view_browsertest.cc

 // Copyright (c) 2011 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/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
@@ skipping 157 matching lines @@
         content::Source<Browser>(panel->browser()));
     panel->Close();
     signal.Wait();
   }
 
   // We put all the testing logic in this class instead of the test so that
   // we do not need to declare each new test as a friend of PanelBrowserView
   // for the purpose of accessing its private members.
   void TestMinimizeAndRestore(bool enable_auto_hiding) {
     PanelManager* panel_manager = PanelManager::GetInstance();
-    int expected_bottom_on_minimized = testing_work_area().height();
-    int expected_bottom_on_unminimized = expected_bottom_on_minimized;
+    int expected_bottom_on_expanded = testing_work_area().height();
+    int expected_bottom_on_title_only = expected_bottom_on_expanded;
+    int expected_bottom_on_minimized = expected_bottom_on_expanded;
 
     // Turn on auto-hiding if requested.
     static const int bottom_thickness = 40;
     mock_auto_hiding_desktop_bar()->EnableAutoHiding(
         AutoHidingDesktopBar::ALIGN_BOTTOM,
         enable_auto_hiding,
         bottom_thickness);
     if (enable_auto_hiding)
-      expected_bottom_on_unminimized -= bottom_thickness;
+      expected_bottom_on_title_only -= bottom_thickness;
 
     // Create and test one panel first.
     Panel* panel1 = CreatePanel("PanelTest1");
     PanelBrowserView* browser_view1 = GetBrowserView(panel1);
     PanelBrowserFrameView* frame_view1 = browser_view1->GetFrameView();
 
     // Test minimizing/restoring an individual panel.
     EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
     EXPECT_EQ(0, panel_manager->minimized_panel_count());
     int initial_height = panel1->GetBounds().height();
     int titlebar_height = frame_view1->NonClientTopBorderHeight();
 
     panel1->SetExpansionState(Panel::MINIMIZED);
     EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
     EXPECT_LT(panel1->GetBounds().height(), titlebar_height);
     EXPECT_GT(panel1->GetBounds().height(), 0);
     EXPECT_EQ(expected_bottom_on_minimized, panel1->GetBounds().bottom());
     EXPECT_EQ(1, panel_manager->minimized_panel_count());
     WaitTillBoundsAnimationFinished(panel1);
     EXPECT_FALSE(panel1->IsActive());
 
     panel1->SetExpansionState(Panel::TITLE_ONLY);
     EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
     EXPECT_EQ(titlebar_height, panel1->GetBounds().height());
-    EXPECT_EQ(expected_bottom_on_unminimized, panel1->GetBounds().bottom());
+    EXPECT_EQ(expected_bottom_on_title_only, panel1->GetBounds().bottom());
     EXPECT_EQ(1, panel_manager->minimized_panel_count());
     WaitTillBoundsAnimationFinished(panel1);
     EXPECT_TRUE(frame_view1->close_button_->IsVisible());
     EXPECT_TRUE(frame_view1->title_icon_->IsVisible());
     EXPECT_TRUE(frame_view1->title_label_->IsVisible());
 
     panel1->SetExpansionState(Panel::EXPANDED);
     EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
     EXPECT_EQ(initial_height, panel1->GetBounds().height());
-    EXPECT_EQ(expected_bottom_on_unminimized, panel1->GetBounds().bottom());
+    EXPECT_EQ(expected_bottom_on_expanded, panel1->GetBounds().bottom());
     EXPECT_EQ(0, panel_manager->minimized_panel_count());
     WaitTillBoundsAnimationFinished(panel1);
     EXPECT_TRUE(frame_view1->close_button_->IsVisible());
     EXPECT_TRUE(frame_view1->title_icon_->IsVisible());
     EXPECT_TRUE(frame_view1->title_label_->IsVisible());
 
     panel1->SetExpansionState(Panel::MINIMIZED);
     EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
     EXPECT_LT(panel1->GetBounds().height(), titlebar_height);
     EXPECT_GT(panel1->GetBounds().height(), 0);
     EXPECT_EQ(expected_bottom_on_minimized, panel1->GetBounds().bottom());
     EXPECT_EQ(1, panel_manager->minimized_panel_count());
 
     panel1->SetExpansionState(Panel::TITLE_ONLY);
     EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
     EXPECT_EQ(titlebar_height, panel1->GetBounds().height());
-    EXPECT_EQ(expected_bottom_on_unminimized, panel1->GetBounds().bottom());
+    EXPECT_EQ(expected_bottom_on_title_only, panel1->GetBounds().bottom());
     EXPECT_EQ(1, panel_manager->minimized_panel_count());
 
     // Create 2 more panels for more testing.
     Panel* panel2 = CreatePanel("PanelTest2");
     Panel* panel3 = CreatePanel("PanelTest3");
 
     // Test bringing up or down the title-bar of all minimized panels.
     EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
     panel3->SetExpansionState(Panel::MINIMIZED);
     EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
@@ skipping 115 matching lines @@
     int right_bar_thickness = 30;
     mock_auto_hiding_desktop_bar()->EnableAutoHiding(
         AutoHidingDesktopBar::ALIGN_BOTTOM, true, bottom_bar_thickness);
     mock_auto_hiding_desktop_bar()->EnableAutoHiding(
         AutoHidingDesktopBar::ALIGN_RIGHT, true, right_bar_thickness);
     EXPECT_EQ(
         initial_starting_right_position - manager->StartingRightPosition(),
         right_bar_thickness);
 
     Panel* panel = CreatePanel("PanelTest");
+    panel->SetExpansionState(Panel::TITLE_ONLY);
+    WaitTillBoundsAnimationFinished(panel);
+
     EXPECT_EQ(testing_work_area().height() - bottom_bar_thickness,
               panel->GetBounds().bottom());
     EXPECT_GT(testing_work_area().right() - right_bar_thickness,
               panel->GetBounds().right());
 
     initial_starting_right_position = manager->StartingRightPosition();
     int bottom_bar_thickness_delta = 10;
     bottom_bar_thickness += bottom_bar_thickness_delta;
     int right_bar_thickness_delta = 15;
     right_bar_thickness += right_bar_thickness_delta;
@@ skipping 222 matching lines @@
 // TODO(jianli): Investigate why this fails on win trunk build.
 // http://crbug.com/102734
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) {
   TestDrawAttention();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) {
   TestChangeAutoHideTaskBarThickness();
 }
 #endif