[Extensions UI] Remove all traces of the chevron

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 <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 181 matching lines @@
 
   // If there are no actions to show (and this isn't an overflow container),
   // then don't show the container at all.
   if (toolbar_actions_.empty())
     return gfx::Size();
 
   return gfx::Size(IconCountToWidth(GetIconCount()), IconHeight());
 }
 
 int ToolbarActionsBar::GetMinimumWidth() const {
-  if (!platform_settings_.chevron_enabled || toolbar_actions_.empty())
-    return platform_settings_.item_spacing;
-  return 2 * platform_settings_.item_spacing + delegate_->GetChevronWidth();
+  return platform_settings_.item_spacing;
 }
 
 int ToolbarActionsBar::GetMaximumWidth() const {
   return IconCountToWidth(-1);
 }
 
 int ToolbarActionsBar::IconCountToWidth(int icons) const {
   if (icons < 0)
     icons = toolbar_actions_.size();
-  const bool display_chevron =
-      platform_settings_.chevron_enabled &&
-      static_cast<size_t>(icons) < toolbar_actions_.size();
-  if (icons == 0 && !display_chevron)
-    return platform_settings_.item_spacing;
-
-  const int icons_size = (icons == 0) ? 0 :
-      (icons * IconWidth(true)) - platform_settings_.item_spacing;
-  const int chevron_size = display_chevron ? delegate_->GetChevronWidth() : 0;
-  const int side_padding = platform_settings_.item_spacing * 2;
-
-  return icons_size + chevron_size + side_padding;
+  return icons * IconWidth(true) + platform_settings_.item_spacing;
 }
 
 size_t ToolbarActionsBar::WidthToIconCount(int pixels) const {
   // Check for widths large enough to show the entire icon set.
   if (pixels >= IconCountToWidth(-1))
     return toolbar_actions_.size();
 
-  // We reserve space for the padding on either side of the toolbar and,
-  // if enabled, for the chevron.
+  // We reserve space for the padding on either side of the toolbar.
   int available_space = pixels - (platform_settings_.item_spacing * 2);
-  if (platform_settings_.chevron_enabled)
-    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));

[Evan Stade, 2016/05/24 22:07:18]

optional nit: pixels - platform_settings_.item_spacing, get rid of
available_space

[Devlin, 2016/05/25 00:38:46]

Done.

 }
 
 size_t ToolbarActionsBar::GetIconCount() const {
   if (!model_)
     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_) {
@@ skipping 451 matching lines @@
            ->IsBeingUpgraded(action_id) ||
       (browser_->profile()->IsOffTheRecord() &&
        !extensions::util::IsIncognitoEnabled(action_id, browser_->profile()))) {
     if (toolbar_actions_.size() > model_->visible_icon_count()) {
       // If we have more icons than we can show, then we must not be changing
       // the container size (since we either removed an icon from the main
       // area and one from the overflow list will have shifted in, or we
       // removed an entry directly from the overflow list).
       delegate_->Redraw(false);
     } else {
-      delegate_->SetChevronVisibility(false);
       // Either we went from overflow to no-overflow, or we shrunk the no-
       // overflow container by 1.  Either way the size changed, so animate.
       ResizeDelegate(gfx::Tween::EASE_OUT, false);
     }
   }
 }
 
 void ToolbarActionsBar::OnToolbarActionMoved(const std::string& action_id,
                                              int index) {
   DCHECK(index >= 0 && index < static_cast<int>(toolbar_actions_.size()));
@@ skipping 13 matching lines @@
 
 void ToolbarActionsBar::OnToolbarVisibleCountChanged() {
   ResizeDelegate(gfx::Tween::EASE_OUT, false);
 }
 
 void ToolbarActionsBar::ResizeDelegate(gfx::Tween::Type tween_type,
                                        bool suppress_chevron) {
   int desired_width = GetPreferredSize().width();
   if (desired_width !=
       delegate_->GetWidth(ToolbarActionsBarDelegate::GET_WIDTH_CURRENT)) {
-    delegate_->ResizeAndAnimate(tween_type, desired_width, suppress_chevron);
+    delegate_->ResizeAndAnimate(tween_type, desired_width);
   } else if (delegate_->IsAnimating()) {
     // It's possible that we're right where we're supposed to be in terms of
     // width, but that we're also currently resizing. If this is the case, end
     // the current animation with the current width.
     delegate_->StopAnimating();
   } else {
     // We may already be at the right size (this can happen frequently with
     // overflow, where we have a fixed width, and in tests, where we skip
     // animations). If this is the case, we still need to Redraw(), because the
     // icons within the toolbar may have changed (e.g. if we removed one
@@ skipping 87 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();
 }