Chromium Code Reviews| Index: chrome/browser/ui/panels/panel_browsertest.cc |
| diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc |
| index ada5e7e70c025cc2af57ead6f6e3e8a13d9d20a9..8a7efa559caf936ce597ecad28e78110020b9cea 100644 |
| --- a/chrome/browser/ui/panels/panel_browsertest.cc |
| +++ b/chrome/browser/ui/panels/panel_browsertest.cc |
| @@ -852,17 +852,13 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ResizePanel) { |
| EXPECT_TRUE(panel->auto_resizable()); |
| EXPECT_EQ(Panel::EXPANDED, panel->expansion_state()); |
| - // Verify resizing an auto-resizable panel is a no-op for now. |
| - // http://crbug.com/109343 |
| + // Verify resizing an auto-resizable panel works. |
| gfx::Rect original_bounds = panel->GetBounds(); |
| gfx::Rect original_restored_bounds = panel->GetRestoredBounds(); |
| - gfx::Size new_size(150, 200); |
| - panel_manager->ResizePanel(panel, new_size); |
| - EXPECT_EQ(original_bounds, panel->GetBounds()); |
| - EXPECT_EQ(original_restored_bounds, panel->GetRestoredBounds()); |
| - |
| - // Verify resizing adjusts bounds correctly when not auto-resizable. |
| - panel->SetAutoResizable(false); |
| + // These should be identical because the panel is expanded. |
| + EXPECT_EQ(original_bounds.size(), original_restored_bounds.size()); |
| + gfx::Size new_size(original_bounds.size()); |
| + new_size.Enlarge(5, 5); |
| panel_manager->ResizePanel(panel, new_size); |
| EXPECT_FALSE(panel->auto_resizable()); |
| EXPECT_EQ(new_size, panel->GetBounds().size()); |
| @@ -877,6 +873,17 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ResizePanel) { |
| EXPECT_EQ(original_height, panel->GetBounds().height()); |
| EXPECT_EQ(new_size, panel->GetRestoredBounds().size()); |
| + // Make it autoresized again. |
| + panel->SetAutoResizable(); |
|
jennb
2012/02/29 00:11:50
takes a param
|
| + ui_test_utils::WindowedNotificationObserver enlarge( |
| + chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, |
| + content::Source<Panel>(panel)); |
| + EXPECT_TRUE(ui_test_utils::ExecuteJavaScript( |
| + panel_browser->GetSelectedWebContents()->GetRenderViewHost(), |
| + std::wstring(), |
| + L"changeSize(50);")); |
|
jennb
2012/02/29 00:11:50
This only applies to the update-preferred-size.htm
|
| + enlarge.Wait(); |
| + |
| panel->Close(); |
| } |