| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| index acef91bb2b3765549c93bbb29a74dcc526a2c471..59ef7d5f97f56b5332b2713fa5236f7d355b90f7 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
|
| @@ -193,16 +193,16 @@ int ToolbarActionsBar::GetMaximumWidth() const {
|
| int ToolbarActionsBar::IconCountToWidth(int icons) const {
|
| if (icons < 0)
|
| icons = toolbar_actions_.size();
|
| - const bool display_chevron =
|
| + 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 :
|
| + 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;
|
| + int chevron_size = display_chevron ? delegate_->GetChevronWidth() : 0;
|
| + int side_padding = platform_settings_.item_spacing * 2;
|
|
|
| return icons_size + chevron_size + side_padding;
|
| }
|
|
|