[Mac] Adjust toolbar spacing of browser actions for M6.

Toolbar.xib change brings browser-action container view out from under
Omnibox.

Push browser-action sizing code into controller to reduce exposed
constants.  Make size consistent with other toolbar buttons.  4px
visual spacing from omnibox to first browser action (grippy in that
area), between browser actions, and last action to wrench menu.

browser_actions_overflow_Template.pdf resource for browser-action
chevron.  Chevron same height as browser actions.  Get rid of divider
between browser actions and wrench (future CL will integrate it into
chevron button).  Chevron 4px from Omnibox or 2px from last browser
action, then 4px to wrench menu.  Chevron button has hover like other
buttons.

BUG=50575
TEST=Browser-actions area still works right WRT spacing and rearranging and everything else.

Review URL: http://codereview.chromium.org/3012044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54782 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 65 insertions, 76 deletions

diff --git a/chrome/browser/cocoa/extensions/browser_action_button.h b/chrome/browser/cocoa/extensions/browser_action_button.h
index 4c8346c..606b033 100644
--- a/chrome/browser/cocoa/extensions/browser_action_button.h
+++ b/chrome/browser/cocoa/extensions/browser_action_button.h
@@ -26,8 +26,6 @@ extern NSString* const kBrowserActionButtonDraggingNotification;
 // Fired when the user drops the button.
 extern NSString* const kBrowserActionButtonDragEndNotification;
 
-extern const CGFloat kBrowserActionWidth;
-
 @interface BrowserActionButton : NSButton {
  @private
   // Bridge to proxy Chrome notifications to the Obj-C class as well as load the
@@ -58,9 +56,10 @@ extern const CGFloat kBrowserActionWidth;
   BOOL dragCouldStart_;
 }
 
-- (id)initWithExtension:(Extension*)extension
-                profile:(Profile*)profile
-                  tabId:(int)tabId;
+- (id)initWithFrame:(NSRect)frame
+          extension:(Extension*)extension
+            profile:(Profile*)profile
+              tabId:(int)tabId;
 
 - (void)setFrame:(NSRect)frameRect animate:(BOOL)animate;
 
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm
index 202cd93..70f15ee 100644
--- a/chrome/browser/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/cocoa/extensions/browser_action_button.mm
@@ -35,15 +35,6 @@ NSString* const kBrowserActionButtonDragEndNotification =
 
 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
 
-// Since the container is the maximum height of the toolbar, we have to move the
-// buttons up by this amount in order to have them look vertically centered
-// within the toolbar.
-static const CGFloat kBrowserActionOriginYOffset = 6.0;
-
-// The size of each button on the toolbar.
-static const CGFloat kBrowserActionHeight = 27;
-const CGFloat kBrowserActionWidth = 29;
-
 namespace {
 const CGFloat kAnimationDuration = 0.2;
 const CGFloat kShadowOffset = 2.0;
@@ -121,13 +112,10 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
   return [BrowserActionCell class];
 }
 
-- (id)initWithExtension:(Extension*)extension
-                profile:(Profile*)profile
-                  tabId:(int)tabId {
-  NSRect frame = NSMakeRect(0.0,
-                            kBrowserActionOriginYOffset,
-                            kBrowserActionWidth,
-                            kBrowserActionHeight);
+- (id)initWithFrame:(NSRect)frame
+          extension:(Extension*)extension
+            profile:(Profile*)profile
+              tabId:(int)tabId {
   if ((self = [super initWithFrame:frame])) {
     BrowserActionCell* cell = [[[BrowserActionCell alloc] init] autorelease];
     // [NSButton setCell:] warns to NOT use setCell: other than in the
@@ -280,7 +268,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
 }
 
 - (NSImage*)compositedImage {
-  NSRect bounds = NSMakeRect(0, 0, kBrowserActionWidth, kBrowserActionHeight);
+  NSRect bounds = [self bounds];
   NSImage* image = [[[NSImage alloc] initWithSize:bounds.size] autorelease];
   [image lockFocus];
 
diff --git a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
index 234ed6c..56dbcec 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
@@ -19,13 +19,8 @@ NSString* const kBrowserActionGrippyDragFinishedNotification =
 
 namespace {
 const CGFloat kAnimationDuration = 0.2;
-const CGFloat kGrippyWidth = 8.0;
-const CGFloat kLowerPadding = 6.0;
+const CGFloat kGrippyWidth = 4.0;
 const CGFloat kMinimumContainerWidth = 10.0;
-const CGFloat kRightBorderXOffset = -1.0;
-const CGFloat kRightBorderWidth = 1.0;
-const CGFloat kRightBorderGrayscale = 0.5;
-const CGFloat kUpperPadding = 9.0;
 }  // namespace
 
 @interface BrowserActionsContainerView(Private)
@@ -57,24 +52,6 @@ const CGFloat kUpperPadding = 9.0;
   return self;
 }
 
-- (void)drawRect:(NSRect)dirtyRect {
-  NSRect bounds = [self bounds];
-  NSColor* middleColor =
-     [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:1.0];
-  NSColor* endPointColor =
-     [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:0.0];
-  scoped_nsobject<NSGradient> borderGradient([[NSGradient alloc]
-     initWithColorsAndLocations:endPointColor, (CGFloat)0.0,
-                                middleColor, (CGFloat)0.5,
-                                endPointColor, (CGFloat)1.0,
-                                nil]);
-  CGFloat xPos = bounds.origin.x + bounds.size.width - kRightBorderWidth +
-     kRightBorderXOffset;
-  NSRect borderRect = NSMakeRect(xPos, kLowerPadding, kRightBorderWidth,
-     bounds.size.height - kUpperPadding);
-  [borderGradient drawInRect:borderRect angle:90.0];
-}
-
 - (void)setResizable:(BOOL)resizable {
   if (resizable == resizable_)
     return;
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.h b/chrome/browser/cocoa/extensions/browser_actions_controller.h
index 350743c..21b0b95 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.h
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.h
@@ -22,9 +22,6 @@ class ExtensionsServiceObserverBridge;
 class PrefService;
 class Profile;
 
-// The padding between browser action buttons.
-extern const CGFloat kBrowserActionButtonPadding;
-
 // Sent when the visibility of the Browser Actions changes.
 extern NSString* const kBrowserActionVisibilityChangedNotification;
 
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
index 19a1d56..cded5e9 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
@@ -7,7 +7,7 @@
 #include <cmath>
 #include <string>
 
-#include "app/resource_bundle.h"
+#include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/pref_service.h"
@@ -25,11 +25,8 @@
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_names.h"
-#include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
-const CGFloat kBrowserActionButtonPadding = 3;
-
 NSString* const kBrowserActionVisibilityChangedNotification =
     @"BrowserActionVisibilityChangedNotification";
 
@@ -38,11 +35,28 @@ const CGFloat kAnimationDuration = 0.2;
 // When determining the opacity during a drag, we artificially reduce the
 // distance to the edge in order to make the fade more apparent.
 const CGFloat kButtonOpacityLeadPadding = 5.0;
-const CGFloat kChevronHeight = 28.0;
-const CGFloat kChevronLowerPadding = 5.0;
-const CGFloat kChevronRightPadding = 5.0;
 const CGFloat kChevronWidth = 14.0;
-const CGFloat kGrippyXOffset = 5.0;
+
+// Image used for the overflow button.
+NSString* const kOverflowChevronsName =
+    @"browser_actions_overflow_Template.pdf";
+
+// Since the container is the maximum height of the toolbar, we have
+// to move the buttons up by this amount in order to have them look
+// vertically centered within the toolbar.
+const CGFloat kBrowserActionOriginYOffset = 5.0;
+
+// The size of each button on the toolbar.
+const CGFloat kBrowserActionHeight = 29.0;
+const CGFloat kBrowserActionWidth = 29.0;
+
+// The padding between browser action buttons.
+const CGFloat kBrowserActionButtonPadding = 2.0;
+
+// Padding between Omnibox and first button.  Since the buttons have a
+// pixel of internal padding, this needs an extra pixel.
+const CGFloat kBrowserActionLeftPadding = kBrowserActionButtonPadding + 1.0;
+
 }  // namespace
 
 @interface BrowserActionsController(Private)
@@ -449,10 +463,14 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
   if ([self buttonCount] == 0)
     [containerView_ setHidden:NO];
 
-  BrowserActionButton* newButton = [[[BrowserActionButton alloc]
-      initWithExtension:extension
-                profile:profile_
-                  tabId:[self currentTabId]] autorelease];
+  NSRect buttonFrame = NSMakeRect(0.0, kBrowserActionOriginYOffset,
+                                  kBrowserActionWidth, kBrowserActionHeight);
+  BrowserActionButton* newButton =
+      [[[BrowserActionButton alloc]
+         initWithFrame:buttonFrame
+             extension:extension
+               profile:profile_
+                 tabId:[self currentTabId]] autorelease];
   [newButton setTarget:self];
   [newButton setAction:@selector(browserActionClicked:)];
   NSString* buttonKey = base::SysUTF8ToNSString(extension->id());
@@ -549,25 +567,34 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
 }
 
 - (CGFloat)containerWidthWithButtonCount:(NSUInteger)buttonCount {
-  CGFloat width = 0.0;
+  // Left-side padding which works regardless of whether a button or
+  // chevron leads.
+  CGFloat width = kBrowserActionLeftPadding;
+
+  // Include the buttons and padding between.
   if (buttonCount > 0) {
-    width = kGrippyXOffset + (2 * kBrowserActionButtonPadding) +
-        (buttonCount * (kBrowserActionWidth + kBrowserActionButtonPadding));
+    width += buttonCount * kBrowserActionWidth;
+    width += (buttonCount - 1) * kBrowserActionButtonPadding;
   }
+
   // Make room for the chevron if any buttons are hidden.
   if ([self buttonCount] != [self visibleButtonCount]) {
-    width += kChevronWidth + kBrowserActionButtonPadding;
-    // Add more space if all buttons are hidden.
-    if ([self visibleButtonCount] == 0)
-      width += 3 * kBrowserActionButtonPadding;
+    // Chevron and buttons both include 1px padding w/in their bounds,
+    // so this leaves 2px between the last browser action and chevron,
+    // and also works right if the chevron is the only button.
+    width += kChevronWidth;
   }
 
   return width;
 }
 
 - (NSUInteger)containerButtonCapacity {
-  CGFloat containerWidth = [self savedWidth];
-  return (containerWidth - kGrippyXOffset) /
+  // Edge-to-edge span of the browser action buttons.
+  CGFloat actionSpan = [self savedWidth] - kBrowserActionLeftPadding;
+
+  // Add in some padding for the browser action on the end, then
+  // divide out to get the number of action buttons that fit.
+  return (actionSpan + kBrowserActionButtonPadding) /
       (kBrowserActionWidth + kBrowserActionButtonPadding);
 }
 
@@ -668,7 +695,7 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
 - (void)moveButton:(BrowserActionButton*)button
            toIndex:(NSUInteger)index
            animate:(BOOL)animate {
-  CGFloat xOffset = kGrippyXOffset +
+  CGFloat xOffset = kBrowserActionLeftPadding +
       (index * (kBrowserActionWidth + kBrowserActionButtonPadding));
   NSRect buttonFrame = [button frame];
   buttonFrame.origin.x = xOffset;
@@ -733,11 +760,11 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
 }
 
 - (void)updateChevronPositionInFrame:(NSRect)frame {
-  CGFloat xPos = NSWidth(frame) - kChevronWidth - kChevronRightPadding;
+  CGFloat xPos = NSWidth(frame) - kChevronWidth;
   NSRect buttonFrame = NSMakeRect(xPos,
-                                  kChevronLowerPadding,
+                                  kBrowserActionOriginYOffset,
                                   kChevronWidth,
-                                  kChevronHeight);
+                                  kBrowserActionHeight);
   [chevronMenuButton_ setFrame:buttonFrame];
 }
 
@@ -750,8 +777,9 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
   if (!chevronMenuButton_.get()) {
     chevronMenuButton_.reset([[MenuButton alloc] init]);
     [chevronMenuButton_ setBordered:NO];
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    [chevronMenuButton_ setImage:rb.GetNSImageNamed(IDR_BOOKMARK_BAR_CHEVRONS)];
+    [chevronMenuButton_ setShowsBorderOnlyWhileMouseInside:YES];
+    NSImage* chevronImage = nsimage_cache::ImageNamed(kOverflowChevronsName);
+    [chevronMenuButton_ setImage:chevronImage];
     [containerView_ addSubview:chevronMenuButton_];
   }