Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6015)

Unified Diff: chrome/browser/ui/panels/panel_browser_view_browsertest.cc

Issue 8566034: Align expanded panel to the bottom of screen edge when there is an auto-hiding taskbar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_browser_view_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
index 50d97a6ba61ae41bb7432040d75bc76985a223f1..ae880953683f6a57e627b94c4963c89d78451913 100644
--- a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
@@ -175,8 +175,9 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
// 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;
@@ -185,7 +186,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
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");
@@ -210,7 +211,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
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());
@@ -220,7 +221,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
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());
@@ -237,7 +238,7 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
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.
@@ -373,6 +374,9 @@ class PanelBrowserViewTest : public BasePanelBrowserTest {
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,
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698