Increase visual spacing between browser action buttons to 5px.

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2009 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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 12 matching lines @@
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/text_button.h"
 
 // The size (both dimensions) of the buttons for page actions.
 static const int kButtonSize = 29;
 
 // The padding between the browser actions and the omnibox/page menu.
 static const int kHorizontalPadding = 4;
 
+// The padding between browser action buttons. Visually, the actual number of
+// empty (non-drawing) pixels is this value + 2 when adjacent browser icons
+// use their maximum allowed size.
+static const int kBrowserActionButtonPadding = 3;
+
 // This is the same value from toolbar.cc. We position the browser actions
 // container flush with the edges of the toolbar as a special case so that we
 // can draw the badge outside the visual bounds of the container.
 static const int kControlVertOffset = 6;
 
 // The maximum of the minimum number of browser actions present when there is
 // not enough space to fit all the browser actions in the toolbar.
 static const int kMinimumNumberOfVisibleBrowserActions = 2;
 
 
@@ skipping 290 matching lines @@
   // Otherwise, we send the action to the extension.
   ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
       profile_, browser_action.extension_id(), toolbar_->browser());
 }
 
 gfx::Size BrowserActionsContainer::GetPreferredSize() {
   if (browser_action_views_.empty())
     return gfx::Size(0, 0);
   int width = kHorizontalPadding * 2 +
       browser_action_views_.size() * kButtonSize;
+  if (browser_action_views_.size() > 1)
+    width += (browser_action_views_.size() - 1) * kBrowserActionButtonPadding;
   return gfx::Size(width, kButtonSize);
 }
 
 void BrowserActionsContainer::Layout() {
   for (size_t i = 0; i < browser_action_views_.size(); ++i) {
     BrowserActionView* view = browser_action_views_[i];
-    int x = kHorizontalPadding + i * kButtonSize;
+    int x = kHorizontalPadding +
+        i * (kButtonSize + kBrowserActionButtonPadding);
     if (x + kButtonSize <= width()) {
       view->SetBounds(x, 0, kButtonSize, height());
       view->SetVisible(true);
     } else {
       view->SetVisible(false);
     }
   }
 }
 
 void BrowserActionsContainer::Observe(NotificationType type,
@@ skipping 48 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kButtonSize +
                   kHorizontalPadding * 2);
 }