Fix handling of minimized panel count

chrome/browser/ui/panels/panel_manager.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 "chrome/browser/ui/panels/panel_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 151 matching lines @@
 
 void PanelManager::Drag(const gfx::Point& mouse_location) {
   drag_controller_->Drag(mouse_location);
 }
 
 void PanelManager::EndDragging(bool cancelled) {
   drag_controller_->EndDragging(cancelled);
 }
 
 void PanelManager::OnPanelExpansionStateChanged(Panel* panel) {
-  docked_strip_->OnPanelExpansionStateChanged(panel);
+  // For panels outside of the docked strip changing state is a no-op.
+  // But since this method may be called for panels in other strips
+  // we need to check this condition.
+  if (panel->panel_strip() == docked_strip_.get())
+    docked_strip_->OnPanelExpansionStateChanged(panel);
+
 }
 
 void PanelManager::OnWindowAutoResized(Panel* panel,
                                        const gfx::Size& preferred_window_size) {
   DCHECK(auto_sizing_enabled_);
-  docked_strip_->ResizePanelWindow(panel, preferred_window_size);
+  // Even though overflow panels are always minimized, we need
+  // to keep track of their size to put them back into the
+  // docked strip when they fit. So the docked panel strip manages
+  // the size of panels for the overflow strip as well.
+  if (panel->panel_strip() == overflow_strip_.get())
+    docked_strip_->ResizePanelWindow(panel, preferred_window_size);
+  else
+    panel->panel_strip()->ResizePanelWindow(panel, preferred_window_size);
 }
 
 void PanelManager::ResizePanel(Panel* panel, const gfx::Size& new_size) {
-  docked_strip_->ResizePanelWindow(panel, new_size);
+  // See the comment in OnWindowAutoResized()
+  if (panel->panel_strip() == overflow_strip_.get())
+    docked_strip_->ResizePanelWindow(panel, new_size);
+  else
+    panel->panel_strip()->ResizePanelWindow(panel, new_size);
   panel->SetAutoResizable(false);
 }
 
 void PanelManager::MovePanelToStrip(
     Panel* panel,
     PanelStrip::Type new_layout,
     PanelStrip::PositioningMask positioning_mask) {
   DCHECK(panel);
   PanelStrip* current_strip = panel->panel_strip();
   DCHECK(current_strip);
@@ skipping 133 matching lines @@
   return panels;
 }
 
 int PanelManager::overflow_strip_width() const {
   return kOverflowStripThickness;
 }
 
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }