Add test cases for panel overflow handling.

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"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/public/browser/notification_service.h"
 #include "ui/base/animation/slide_animation.h"
 
 namespace {
-// The width of the overflow area that is expanded to show more info, i.e.
-// titles, when the mouse hovers over the area.
-const int kOverflowAreaHoverWidth = 200;
-
 // Maximium number of overflow panels allowed to be shown.
 const size_t kMaxVisibleOverflowPanelsAllowed = 6;
 
 // This value is experimental and subjective.
 const int kOverflowHoverAnimationMs = 180;
 }
 
 PanelOverflowStrip::PanelOverflowStrip(PanelManager* panel_manager)
     : panel_manager_(panel_manager),
+      max_visible_panels_(kMaxVisibleOverflowPanelsAllowed),
       are_overflow_titles_shown_(false),
       overflow_hover_animator_start_width_(0),
       overflow_hover_animator_end_width_(0) {
 }
 
 PanelOverflowStrip::~PanelOverflowStrip() {
   DCHECK(panels_.empty());
 }
 
 void PanelOverflowStrip::SetDisplayArea(const gfx::Rect& display_area) {
@@ skipping 58 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() || start_index == panels_.size())

[jennb, 2011/12/08 23:52:00]

Why do we need these extra checks? The condition in the for loop already catches
if there's nothing to do.

[jianli, 2011/12/09 22:39:07]

We need this because when last is being removed, start_index is panels_.size() -
1. However, removing that panel causes panels_.size() to be one less and thus
end_index which is panels_.size() - 1 will be also one less.

     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());
     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() :
       panels_[index - 1]->GetBounds().y();
   bounds.set_x(display_area_.x());
   bounds.set_y(bottom - iconified_size.height());
 
   if (are_overflow_titles_shown_) {
     // Both icon and title are visible when the mouse hovers over the overflow
     // area.
     bounds.set_width(kOverflowAreaHoverWidth);
     bounds.set_height(iconified_size.height());
-  } else if (index < kMaxVisibleOverflowPanelsAllowed) {
+  } else if (static_cast<int>(index) < max_visible_panels_) {
     // Only the icon is visible.
     bounds.set_width(iconified_size.width());
     bounds.set_height(iconified_size.height());
   } else {
     // Invisible for overflow-on-overflow.
     bounds.set_width(0);
     bounds.set_height(0);
   }
 
   return bounds;
 }
 
 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;
   Panel* top_visible_panel;
   if (are_overflow_titles_shown_) {
     width = kOverflowAreaHoverWidth;
     top_visible_panel = panels_.back();
   } else {
     width = display_area_.width();
-    top_visible_panel = panels_.size() >= kMaxVisibleOverflowPanelsAllowed ?
-        panels_[kMaxVisibleOverflowPanelsAllowed - 1] : panels_.back();
+    top_visible_panel = num_panels() >= max_visible_panels_ ?

[jennb, 2011/12/08 23:52:00]

Why switch to num_panels()? Elsewhere in file, panels_.size() is used.

[jianli, 2011/12/09 22:39:07]

To avoid writing sth like "static_cast<int>(panels_.size())" due to the complain
about signed/unsigned comparison.

+        panels_[max_visible_panels_ - 1] : panels_.back();
   }
   return mouse_position.x() <= display_area_.x() + width &&
          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;
@@ skipping 18 matching lines @@
 
   if (!overflow_hover_animator_.get())
     overflow_hover_animator_.reset(new ui::SlideAnimation(this));
   if (overflow_hover_animator_->IsShowing())
     overflow_hover_animator_->Reset();
   overflow_hover_animator_->SetSlideDuration(kOverflowHoverAnimationMs);
 
   overflow_hover_animator_->Show();
 }
 
+void PanelOverflowStrip::AnimationEnded(const ui::Animation* animation) {
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
+      content::Source<PanelOverflowStrip>(this),
+      content::NotificationService::NoDetails());
+}
+
 void PanelOverflowStrip::AnimationProgressed(const ui::Animation* animation) {
   int current_width = overflow_hover_animator_->CurrentValueBetween(
       overflow_hover_animator_start_width_, overflow_hover_animator_end_width_);
   bool end_of_shrinking = current_width == display_area_.width();
 
   // Update each overflow panel.
   for (size_t i = 0; i < panels_.size(); ++i) {
     Panel* overflow_panel = panels_[i];
     gfx::Rect bounds = overflow_panel->GetBounds();
 
-    if (i >= kMaxVisibleOverflowPanelsAllowed && end_of_shrinking) {
+    if (static_cast<int>(i) >= max_visible_panels_ && end_of_shrinking) {
       bounds.set_width(0);
       bounds.set_height(0);
     } else {
       bounds.set_width(current_width);
       bounds.set_height(overflow_panel->IconOnlySize().height());
     }
 
     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);
 }