Fix 2 panel overflow related bugs on Windows.

chrome/browser/ui/panels/panel_overflow_strip.cc

 // Copyright (c) 2011 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_overflow_strip.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
@@ skipping 84 matching lines @@
   DCHECK(panel->expansion_state() == Panel::IN_OVERFLOW);
 }
 
 void PanelOverflowStrip::Refresh() {
   if (panels_.empty())
     return;
   DoRefresh(0, panels_.size() - 1);
 }
 
 void PanelOverflowStrip::DoRefresh(size_t start_index, size_t end_index) {
-  if (panels_.empty())
+  if (panels_.empty() || start_index == panels_.size())

[jennb, 2011/12/08 20:05:46]

Sufficient to just check start_index >= end_index?

     return;
 
   DCHECK(start_index < panels_.size());
   DCHECK(end_index < panels_.size());
 
   for (size_t index = start_index; index <= end_index; ++index) {
     Panel* panel = panels_[index];
     gfx::Rect new_bounds = ComputeLayout(index,
                                          panel->IconOnlySize());
-    DCHECK(!new_bounds.IsEmpty());
     panel->SetPanelBounds(new_bounds);
   }
 }
 
 gfx::Rect PanelOverflowStrip::ComputeLayout(
     size_t index, const gfx::Size& iconified_size) const {
   DCHECK(index != kInvalidPanelIndex);
 
   gfx::Rect bounds;
   int bottom = (index == 0) ? display_area_.bottom() :
@@ skipping 22 matching lines @@
 void PanelOverflowStrip::OnMouseMove(const gfx::Point& mouse_position) {
   bool show_overflow_titles = ShouldShowOverflowTitles(mouse_position);
   ShowOverflowTitles(show_overflow_titles);
 }
 
 bool PanelOverflowStrip::ShouldShowOverflowTitles(
     const gfx::Point& mouse_position) const {
   if (panels_.empty())
     return false;
 
-  int width = are_overflow_titles_shown_ ? kOverflowAreaHoverWidth
-                                         : display_area_.width();
+  int width;
+  Panel* top_visible_panel;
+  if (are_overflow_titles_shown_) {
+    width = kOverflowAreaHoverWidth;
+    top_visible_panel = panels_.back();
+  } else {
+    width = display_area_.width();
+    top_visible_panel = num_panels() >= kMaxVisibleOverflowPanelsAllowed ?
+        panels_[kMaxVisibleOverflowPanelsAllowed - 1] : panels_.back();
+  }
   return mouse_position.x() <= display_area_.x() + width &&
-         panels_.back()->GetBounds().y() <= mouse_position.y() &&
+         top_visible_panel->GetBounds().y() <= mouse_position.y() &&
          mouse_position.y() <= display_area_.bottom();
 }
 
 void PanelOverflowStrip::ShowOverflowTitles(bool show_overflow_titles) {
   if (show_overflow_titles == are_overflow_titles_shown_)
     return;
   are_overflow_titles_shown_ = show_overflow_titles;
 
+  if (panels_.empty())
+    return;
+
   if (show_overflow_titles) {
     overflow_hover_animator_start_width_ = display_area_.width();
     overflow_hover_animator_end_width_ = kOverflowAreaHoverWidth;
 
     // We need to bring all overflow panels to the top of z-order since the
     // active panel might obscure the expanded overflow panels.
     for (Panels::iterator iter = panels_.begin();
          iter != panels_.end(); ++iter) {
       (*iter)->EnsureFullyVisible();
     }
@@ skipping 30 matching lines @@
     }
 
     overflow_panel->SetPanelBoundsInstantly(bounds);
   }
 }
 
 void PanelOverflowStrip::OnFullScreenModeChanged(bool is_full_screen) {
   for (size_t i = 0; i < panels_.size(); ++i)
     panels_[i]->FullScreenModeChanged(is_full_screen);
 }