Fix handling of minimized panel count

chrome/browser/ui/panels/panel_overflow_browsertest.cc

 // Copyright (c) 2012 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 <vector>
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/overflow_panel_strip.h"
@@ skipping 299 matching lines @@
   EXPECT_EQ(3, docked_strip->num_panels());
   EXPECT_EQ(2, overflow_strip->num_panels());
   EXPECT_FALSE(overflow_strip->overflow_indicator());
   EXPECT_TRUE(IsPanelVisible(panel4));
   EXPECT_TRUE(IsPanelInOverflowStrip(panel4));
   EXPECT_FALSE(panel4->IsActive());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
+IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, AddMinimizedTillOverflow) {
+  PanelManager* panel_manager = PanelManager::GetInstance();
+  DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+  OverflowPanelStrip* overflow_strip = panel_manager->overflow_strip();
+
+  EXPECT_EQ(0, panel_manager->num_panels());
+  EXPECT_EQ(0, docked_strip->num_panels());
+  EXPECT_EQ(0, overflow_strip->num_panels());
+  EXPECT_FALSE(overflow_strip->overflow_indicator());

[jianli, 2012/03/12 18:08:56]

nit: this can be removed since we do not care about any change to the overflow
indicator in this test.

+
+  CreatePanelParams params("Test", gfx::Rect(0, 0, 100, 100), SHOW_AS_INACTIVE);
+  params.wait_for_fully_created = false;
+
+  unsigned int num_panels = 0;
+  Panel* last_panel;
+  for (; num_panels < 10; ++num_panels) {

[jennb, 2012/03/12 18:26:27]

nit: suggest making the 10 a defined literal or a var.

+    Panel* panel = last_panel = CreatePanelWithParams(params);

[jianli, 2012/03/12 18:08:56]

nit: seems that one variable |panel| is enough.

+    panel->SetExpansionState(Panel::MINIMIZED);
+
+    panel->panel_strip()->RemovePanel(panel);
+
+    docked_strip->AddPanel(panel);

[jianli, 2012/03/12 18:08:56]

Should we call PanelManager::MovePanelToStrip?

+    EXPECT_EQ(panel->expansion_state(), Panel::MINIMIZED);

[jennb, 2012/03/12 18:26:27]

reverse order. it's EXPECT_EQ(expected_value, actual_value).

+  }
+
+  EXPECT_EQ(num_panels, (unsigned int)10);

[jianli, 2012/03/12 18:08:56]

nit: 10u

+  EXPECT_EQ(num_panels, (unsigned int)

[jianli, 2012/03/12 18:08:56]

nit: better to use static_cast

+      (docked_strip->minimized_panel_count() +
+       docked_strip->num_temporary_layout_panels() +
+            overflow_strip->num_panels()));
+
+  WaitForLayoutModeChanged(last_panel, PanelStrip::IN_OVERFLOW);

[jianli, 2012/03/12 18:08:56]

Should we also check if docked_strip->num_temporary_layout_panels() is 0?

[jennb, 2012/03/12 18:26:27]

When you do RemovePanel/AddPanel, the AddPanel will ensure the panel fits in the
dock. I'm surprised the last_panel still moves to overflow...

+
+  EXPECT_EQ(num_panels, (unsigned int)
+            (docked_strip->minimized_panel_count() +
+             docked_strip->num_temporary_layout_panels() +
+             overflow_strip->num_panels()));
+
+  PanelManager::GetInstance()->CloseAll();
+}
+
+
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_CreateMoreOverflowPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
 
   const int panel_widths[] = {
       250, 260, 200,  // docked
       255, 220, 210,  // overflow
@@ skipping 1314 matching lines @@
   // End full screen mode, expansion occurs again.
   overflow_strip->OnFullScreenModeChanged(false);
   EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive());
   MoveMouse(in_overflow_area);
   EXPECT_GT(overflow_strip->current_display_width(), iconified_width);
   MoveMouse(beyond_overflow_area);
   EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
 
   panel_manager->CloseAll();
 }