[Mac] UI changes for the Browser Actions toolbar container....

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2010 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.
 
 #import "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "app/resource_bundle.h"
@@ skipping 22 matching lines @@
 NSString* const kBrowserActionVisibilityChangedNotification =
     @"BrowserActionVisibilityChangedNotification";
 
 namespace {
 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 kContainerPadding = 2.0;
-const CGFloat kGrippyXOffset = 8.0;
+const CGFloat kGrippyXOffset = 7.0;
 }  // namespace
 
 @interface BrowserActionsController(Private)
 // Used during initialization to create the BrowserActionButton objects from the
 // stored toolbar model.
 - (void)createButtons;
 
 // Creates and then adds the given extension's action button to the container
 // at the given index within the container. It does not affect the toolbar model
 // object since it is called when the toolbar model changes.
@@ skipping 281 matching lines @@
 - (CGFloat)savedWidth {
   if (!toolbarModel_)
     return 0;
   if (!profile_->GetPrefs()->HasPrefPath(prefs::kExtensionToolbarSize)) {
     // Migration code to the new VisibleIconCount pref.
     // TODO(mpcomplete): remove this at some point.
     double predefinedWidth =
         profile_->GetPrefs()->GetReal(prefs::kBrowserActionContainerWidth);
     if (predefinedWidth != 0) {
       int iconWidth = kBrowserActionWidth + kBrowserActionButtonPadding;
-      int extraWidth = kContainerPadding + kChevronWidth;
+      int extraWidth = kChevronWidth;
       toolbarModel_->SetVisibleIconCount(
           (predefinedWidth - extraWidth) / iconWidth);
     }
   }
 
   int savedButtonCount = toolbarModel_->GetVisibleIconCount();
   if (savedButtonCount < 0 ||  // all icons are visible
       static_cast<NSUInteger>(savedButtonCount) > [self buttonCount])
     savedButtonCount = [self buttonCount];
   return [self containerWidthWithButtonCount:savedButtonCount];
@@ skipping 186 matching lines @@
   NSString* extensionId = base::SysUTF8ToNSString(extension->id());
   DCHECK(extensionId);
   if (!extensionId)
     return nil;
   return [buttons_ objectForKey:extensionId];
 }
 
 - (CGFloat)containerWidthWithButtonCount:(NSUInteger)buttonCount {
   CGFloat width = 0.0;
   if (buttonCount > 0) {
-    width = kGrippyXOffset + kContainerPadding +
+    width = kGrippyXOffset +
         (buttonCount * (kBrowserActionWidth + kBrowserActionButtonPadding));
   }
   // Make room for the chevron if any buttons are hidden.
-  if ([self buttonCount] != [self visibleButtonCount]) {
+  if ([self buttonCount] != [self visibleButtonCount])
     width += kChevronWidth + kBrowserActionButtonPadding;
-    // Add extra padding if all buttons are hidden.
-    if ([self visibleButtonCount] == 0)
-      width += 3 * kBrowserActionButtonPadding;
-  }
+
   return width;
 }
 
 - (NSUInteger)containerButtonCapacity {
   CGFloat containerWidth = [self savedWidth];
-  return (containerWidth - kGrippyXOffset + kContainerPadding) /
+  return (containerWidth - kGrippyXOffset) /
       (kBrowserActionWidth + kBrowserActionButtonPadding);
 }
 
 - (void)containerFrameChanged:(NSNotification*)notification {
   [self updateButtonOpacity];
   [[containerView_ window] invalidateCursorRectsForView:containerView_];
   [self updateChevronPositionInFrame:[containerView_ frame]];
 }
 
 - (void)containerDragStart:(NSNotification*)notification {
@@ skipping 145 matching lines @@
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }
 
 - (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate {
   [self setChevronHidden:([self buttonCount] == [self visibleButtonCount])
                  inFrame:frame
                  animate:animate];
 }
 
 - (void)updateChevronPositionInFrame:(NSRect)frame {
-  CGFloat xPos = NSWidth(frame) - kChevronWidth - kChevronRightPadding;
+  CGFloat xPos = NSWidth(frame) - kChevronWidth;
   NSRect buttonFrame = NSMakeRect(xPos,
                                   kChevronLowerPadding,
                                   kChevronWidth,
                                   kChevronHeight);
   [chevronMenuButton_ setFrame:buttonFrame];
 }
 
 - (void)setChevronHidden:(BOOL)hidden
                  inFrame:(NSRect)frame
                  animate:(BOOL)animate {
@@ skipping 82 matching lines @@
   if (profile_->IsOffTheRecord())
     index = toolbarModel_->IncognitoIndexToOriginal(index);
   if (index < toolbarModel_->size()) {
     Extension* extension = toolbarModel_->GetExtensionByIndex(index);
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end