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

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

Issue 8776035: Add PanelOverflowStrip to handle panel overflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 6413356e8300aecb7f881db68a3ddbdc70b85c38..fa59ed6de76ae3d240fdb94632d08ab426d43552 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -27,7 +27,9 @@
#include "chrome/browser/ui/panels/native_panel.h"
#include "chrome/browser/ui/panels/panel.h"
#include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/panels/panel_overflow_strip.h"
#include "chrome/browser/ui/panels/panel_settings_menu_model.h"
+#include "chrome/browser/ui/panels/panel_strip.h"
#include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_notification_types.h"
@@ -81,6 +83,9 @@ class PanelBrowserTest : public BasePanelBrowserTest {
void TestCreatePanelOnOverflow() {
PanelManager* panel_manager = PanelManager::GetInstance();
+ PanelStrip* panel_strip = panel_manager->panel_strip();
+ PanelOverflowStrip* panel_overflow_strip =
+ panel_manager->panel_overflow_strip();
EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
// Create testing extensions.
@@ -106,42 +111,50 @@ class PanelBrowserTest : public BasePanelBrowserTest {
web_app::GenerateApplicationNameFromExtensionId(extension1->id()),
gfx::Rect(0, 0, 200, 200));
ASSERT_EQ(3, panel_manager->num_panels());
+ EXPECT_EQ(3, panel_strip->num_panels());
+ EXPECT_EQ(0, panel_overflow_strip->num_panels());
// Open a panel that would overflow.
Panel* panel4 = CreatePanelWithBounds(
web_app::GenerateApplicationNameFromExtensionId(extension2->id()),
gfx::Rect(0, 0, 280, 200));
ASSERT_EQ(4, panel_manager->num_panels());
- EXPECT_LT(panel4->GetBounds().right(), panel3->GetBounds().x());
- EXPECT_GT(0, panel4->GetBounds().x());
+ EXPECT_EQ(3, panel_strip->num_panels());
+ EXPECT_EQ(1, panel_overflow_strip->num_panels());
+ EXPECT_EQ(Panel::IN_OVERFLOW, panel4->expansion_state());
// Open another panel that would overflow.
Panel* panel5 = CreatePanelWithBounds(
web_app::GenerateApplicationNameFromExtensionId(extension3->id()),
gfx::Rect(0, 0, 300, 200));
ASSERT_EQ(5, panel_manager->num_panels());
- EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
- EXPECT_GT(0, panel5->GetBounds().x());
+ EXPECT_EQ(3, panel_strip->num_panels());
+ EXPECT_EQ(2, panel_overflow_strip->num_panels());
+ EXPECT_EQ(Panel::IN_OVERFLOW, panel4->expansion_state());
+ EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
- // Close a visible panel. Expect an overflow panel to slide over.
+ // Close a visible panel. Expect an overflow panel to move over.
CloseWindowAndWait(panel2->browser());
ASSERT_EQ(4, panel_manager->num_panels());
- EXPECT_LT(panel4->GetBounds().right(), panel3->GetBounds().x());
- EXPECT_LE(0, panel4->GetBounds().x());
- EXPECT_GT(0, panel5->GetBounds().x());
+ EXPECT_EQ(3, panel_strip->num_panels());
+ EXPECT_EQ(1, panel_overflow_strip->num_panels());
+ EXPECT_NE(Panel::IN_OVERFLOW, panel4->expansion_state());
+ EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
- // Close another visible panel. Remaining overflow panel should slide over
- // but still not enough room to be fully visible.
+ // Close another visible panel. Remaining overflow panel cannot move over
+ // due to not enough room.
CloseWindowAndWait(panel3->browser());
ASSERT_EQ(3, panel_manager->num_panels());
- EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
- EXPECT_GT(0, panel5->GetBounds().x());
+ EXPECT_EQ(2, panel_strip->num_panels());
+ EXPECT_EQ(1, panel_overflow_strip->num_panels());
+ EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
// Closing one more panel makes room for all panels to fit on screen.
CloseWindowAndWait(panel4->browser());
ASSERT_EQ(2, panel_manager->num_panels());
- EXPECT_LT(panel5->GetBounds().right(), panel1->GetBounds().x());
- EXPECT_LE(0, panel5->GetBounds().x());
+ EXPECT_EQ(2, panel_strip->num_panels());
+ EXPECT_EQ(0, panel_overflow_strip->num_panels());
+ EXPECT_NE(Panel::IN_OVERFLOW, panel5->expansion_state());
panel1->Close();
panel5->Close();
@@ -533,7 +546,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FindBar) {
panel->Close();
}
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreatePanelOnOverflow) {
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreatePanelOnOverflow) {
TestCreatePanelOnOverflow();
}

Powered by Google App Engine
This is Rietveld 408576698