Fix regression in dragging location bar right edge (Mac).

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 86 matching lines @@
   }
 }
 
 }  // namespace
 
 // static
 bool ToolbarActionsBar::disable_animations_for_testing_ = false;
 
 ToolbarActionsBar::PlatformSettings::PlatformSettings()
     : item_spacing(GetLayoutConstant(TOOLBAR_STANDARD_SPACING)),
+      left_padding(GetLayoutConstant(TOOLBAR_ACTIONS_LEFT_PADDING)),
+      right_padding(GetLayoutConstant(TOOLBAR_ACTIONS_RIGHT_PADDING)),
       icons_per_overflow_menu_row(1),
       chevron_enabled(!extensions::FeatureSwitch::extension_action_redesign()->
                           IsEnabled()) {
 }
 
 ToolbarActionsBar::ToolbarActionsBar(ToolbarActionsBarDelegate* delegate,
                                      Browser* browser,
                                      ToolbarActionsBar* main_bar)
     : delegate_(delegate),
       browser_(browser),
@@ skipping 61 matching lines @@
   // 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_.left_padding + delegate_->GetChevronWidth() +
+      platform_settings_.right_padding;
 }
 
 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 platform_settings_.left_padding + icons_size + chevron_size +
+      platform_settings_.right_padding;
 }
 
 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.
-  int available_space = pixels - (platform_settings_.item_spacing * 2);
+  int available_space = pixels -
+      (platform_settings_.left_padding + platform_settings_.right_padding);
   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));
 }
 
 size_t ToolbarActionsBar::GetIconCount() const {
@@ skipping 69 matching lines @@
   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() ?
       relative_index / icons_per_overflow_row : 0;
   size_t index_in_row = in_overflow_mode() ?
       relative_index % icons_per_overflow_row : relative_index;
 
-  return gfx::Rect(platform_settings().item_spacing +
+  return gfx::Rect(platform_settings().left_padding +
                        index_in_row * IconWidth(true),
                    row_index * IconHeight(),
                    IconWidth(false),
                    IconHeight());
 }
 
 std::vector<ToolbarActionViewController*>
 ToolbarActionsBar::GetActions() const {
   std::vector<ToolbarActionViewController*> actions = toolbar_actions_.get();
 
@@ skipping 456 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();
 }