[Extensions Toolbar] Protect against crazy bounds

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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/toolbar/toolbar_actions_bar.h"
 
 #include "base/auto_reset.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 209 matching lines @@
     available_space -= delegate_->GetChevronWidth();
 
   // Now we add an extra between-item padding value so the space can be divided
   // evenly by (size of icon with padding).
   return static_cast<size_t>(std::max(
       0, available_space + platform_settings_.item_spacing) / IconWidth(true));
 }
 
 size_t ToolbarActionsBar::GetIconCount() const {
   if (!model_)
-    return 0u;
+    return 0;
 
   int pop_out_modifier = 0;
   // If there is a popped out action, it could affect the number of visible
   // icons - but only if it wouldn't otherwise be visible.
   if (popped_out_action_) {
     size_t popped_out_index =
         std::find(toolbar_actions_.begin(),
                   toolbar_actions_.end(),
                   popped_out_action_) - toolbar_actions_.begin();
     pop_out_modifier = popped_out_index >= model_->visible_icon_count() ? 1 : 0;
@@ skipping 16 matching lines @@
   if (!toolbar_actions_.empty() && !suppress_layout_ &&
       model_->actions_initialized()) {
     DCHECK_LE(visible_icons, toolbar_actions_.size());
     DCHECK_EQ(model_->toolbar_items().size(), toolbar_actions_.size());
   }
 #endif
 
   return visible_icons;
 }
 
-gfx::Rect ToolbarActionsBar::GetFrameForIndex(size_t index) const {
-  size_t start_index = in_overflow_mode() ?
-      toolbar_actions_.size() - GetIconCount() : 0u;
+size_t ToolbarActionsBar::GetStartIndexInBounds() const {
+  return in_overflow_mode() ? main_bar_->GetEndIndexInBounds() : 0;
+}
+
+size_t ToolbarActionsBar::GetEndIndexInBounds() const {
+  return in_overflow_mode() ?
+      toolbar_actions_.size() : WidthToIconCount(delegate_->GetWidth());
+}
+
+bool ToolbarActionsBar::NeedsOverflow() const {
+  DCHECK(!in_overflow_mode());
+  return GetEndIndexInBounds() != toolbar_actions_.size();
+}
+
+gfx::Rect ToolbarActionsBar::GetFrameForIndex(
+    size_t index) const {
+  size_t start_index = GetStartIndexInBounds();
 
   // If the index is for an action that is before range we show (i.e., is for
   // a button that's on the main bar, and this is the overflow), send back an
   // empty rect.
   if (index < start_index)
     return gfx::Rect();
 
   size_t relative_index = index - start_index;
   int icons_per_overflow_row = platform_settings().icons_per_overflow_menu_row;
   size_t row_index = in_overflow_mode() ?
@@ skipping 427 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }