Index: chrome/browser/ui/panels/panel_resize_browsertest.cc |
diff --git a/chrome/browser/ui/panels/panel_resize_browsertest.cc b/chrome/browser/ui/panels/panel_resize_browsertest.cc |
index 3cdbdd70246074a84f6724c6ec7cb382ad8ba835..28f402f5dcddd6c937d185737436a3c31cefc4e4 100644 |
--- a/chrome/browser/ui/panels/panel_resize_browsertest.cc |
+++ b/chrome/browser/ui/panels/panel_resize_browsertest.cc |
@@ -27,20 +27,21 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest { |
} |
}; |
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelsAreNotResizable) { |
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) { |
PanelManager* panel_manager = PanelManager::GetInstance(); |
Panel* panel = CreatePanel("Panel"); |
- EXPECT_FALSE(panel->CanResizeByMouse()); |
+ EXPECT_EQ(panel::ALL_SIDES_EXCEPT_BOTTOM, panel->CanResizeByMouse()); |
gfx::Rect bounds = panel->GetBounds(); |
- // Try resizing by the top left corner; verify resize won't work. |
+ // Try resizing by the top left corner; verify resize works. |
jianli
2012/04/13 00:52:36
I think it would be better to test all other edges
jennb
2012/04/13 19:48:04
Done.
|
gfx::Point mouse_location = bounds.origin(); |
panel_manager->StartResizingByMouse(panel, mouse_location, |
panel::RESIZE_TOP_LEFT); |
mouse_location.Offset(-20, -20); |
panel_manager->ResizeByMouse(mouse_location); |
+ bounds.Offset(-20, -20); |
EXPECT_EQ(bounds, panel->GetBounds()); |
panel_manager->EndResizingByMouse(false); |
@@ -76,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) { |
PanelManager* panel_manager = PanelManager::GetInstance(); |
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); |
- EXPECT_TRUE(panel->CanResizeByMouse()); |
+ EXPECT_EQ(panel::ALL_SIDES, panel->CanResizeByMouse()); |
gfx::Rect bounds = panel->GetBounds(); |
@@ -143,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) { |
PanelManager* panel_manager = PanelManager::GetInstance(); |
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); |
- EXPECT_TRUE(panel->CanResizeByMouse()); |
+ EXPECT_EQ(panel::ALL_SIDES, panel->CanResizeByMouse()); |
gfx::Rect bounds = panel->GetBounds(); |
@@ -245,7 +246,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) { |
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); |
PanelResizeController* resize_controller = panel_manager->resize_controller(); |
- EXPECT_TRUE(panel->CanResizeByMouse()); |
+ EXPECT_EQ(panel::ALL_SIDES, panel->CanResizeByMouse()); |
gfx::Rect original_bounds = panel->GetBounds(); |