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 156 matching lines @@
 
 void PanelManager::Drag(int delta_x, int delta_y) {
   drag_controller_->Drag(delta_x, delta_y);
 }
 
 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

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

Maybe reword to say "...but this method may be called while the panel is not in
the docked strip, so we need to check for that condition."

+  // but we still allow it to be called because panels can
+  // jump from strip to strip virtually at any moment.

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

Your comment seems not to be consistent with if check for docked_strip.

+  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_);
+  // DCHECK(panel->panel_strip() == docked_strip_.get());

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

Why is DCHECK commented out?

   docked_strip_->ResizePanelWindow(panel, preferred_window_size);
 }
 
 void PanelManager::ResizePanel(Panel* panel, const gfx::Size& new_size) {
+  // DCHECK(panel->panel_strip() == docked_strip_.get());

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

ditto.

   docked_strip_->ResizePanelWindow(panel, new_size);
   panel->SetAutoResizable(false);
 }
 
 void PanelManager::MovePanelToStrip(Panel* panel,
                                     PanelStrip::Type new_layout) {
   DCHECK(panel);
   PanelStrip* current_strip = panel->panel_strip();
   DCHECK(current_strip);
   DCHECK_NE(current_strip->type(), new_layout);
@@ skipping 125 matching lines @@
   return panels;
 }
 
 int PanelManager::overflow_strip_width() const {
   return kOverflowStripThickness;
 }
 
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }