Update extension buttons to Material Design (Mac).

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 60 matching lines @@
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 // Duration of the toolbar animation.
 const NSTimeInterval kToolBarAnimationDuration = 0.12;
 
-// The size of toolbar buttons in Material Design.
-const NSSize kMaterialDesignToolbarButtonSize = NSMakeSize(28, 28);
-
 // The height of the location bar in Material Design.
 const CGFloat kMaterialDesignLocationBarHeight = 28;
 
 // The padding between Material Design elements (when they don't abut).
 const CGFloat kMaterialDesignElementPadding = 4;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
 class BrowserActionsContainerDelegate :
@@ skipping 191 matching lines @@
   // be called, don't initialize twice.
   if (locationBarView_) {
     DCHECK(base::mac::IsOSYosemiteOrLater());
     return;
   }
 
   // Make Material Design layout adjustments to the NIB items.
   bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
   if (isModeMaterial) {
     ToolbarView* toolbarView = [self toolbarView];
+    NSSize toolbarButtonSize = [ToolbarButton toolbarButtonSize];
 
     // Set the toolbar height.
     NSRect frame = [toolbarView frame];
     frame.size.height = [self baseToolbarHeight];
     [toolbarView setFrame:frame];
 
     NSRect backButtonFrame = [backButton_ frame];
     backButtonFrame.origin.x = kMaterialDesignElementPadding;
     backButtonFrame.origin.y -= 1;
-    backButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    backButtonFrame.size = toolbarButtonSize;
     [backButton_ setFrame:backButtonFrame];
 
     NSRect forwardButtonFrame = [forwardButton_ frame];
     forwardButtonFrame.origin.x = NSMaxX(backButtonFrame);
     forwardButtonFrame.origin.y = backButtonFrame.origin.y;
-    forwardButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    forwardButtonFrame.size = toolbarButtonSize;
     [forwardButton_ setFrame:forwardButtonFrame];
 
     NSRect reloadButtonFrame = [reloadButton_ frame];
     reloadButtonFrame.origin.x = NSMaxX(forwardButtonFrame);
     reloadButtonFrame.origin.y = forwardButtonFrame.origin.y;
-    reloadButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    reloadButtonFrame.size = toolbarButtonSize;
     [reloadButton_ setFrame:reloadButtonFrame];
 
     NSRect homeButtonFrame = [homeButton_ frame];
     homeButtonFrame.origin.x = NSMaxX(reloadButtonFrame);
     homeButtonFrame.origin.y = reloadButtonFrame.origin.y;
-    homeButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    homeButtonFrame.size = toolbarButtonSize;
     [homeButton_ setFrame:homeButtonFrame];
 
     // Replace the app button from the nib with an AppToolbarButton instance for
     // Material Design.
     AppToolbarButton* newMenuButton =
         [[[AppToolbarButton alloc] initWithFrame:[appMenuButton_ frame]]
             autorelease];
     [newMenuButton setAutoresizingMask:[appMenuButton_ autoresizingMask]];
     [[appMenuButton_ superview] addSubview:newMenuButton];
     [appMenuButton_ removeFromSuperview];
     appMenuButton_ = newMenuButton;
 
     // Adjust the menu button's position.
     NSRect toolbarBounds = [toolbarView bounds];
     NSRect menuButtonFrame = [appMenuButton_ frame];
     menuButtonFrame.origin.x = NSMaxX(toolbarBounds) -
-        [ToolbarController appMenuLeftPadding] -
-            kMaterialDesignToolbarButtonSize.width;
+        [ToolbarController appMenuLeftPadding] - toolbarButtonSize.width;
     menuButtonFrame.origin.y = homeButtonFrame.origin.y;
-    menuButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    menuButtonFrame.size = toolbarButtonSize;
     [appMenuButton_ setFrame:menuButtonFrame];
 
     // Adjust the size and location on the location bar to take up the
     // space between the reload and menu buttons.
     NSRect locationBarFrame = [locationBar_ frame];
     locationBarFrame.origin.x = NSMaxX(homeButtonFrame) +
         kMaterialDesignElementPadding;
     locationBarFrame.origin.y = NSMaxY(toolbarBounds) -
         kMaterialDesignElementPadding - [ToolbarController locationBarHeight];
     locationBarFrame.size.width =
         (menuButtonFrame.origin.x - kMaterialDesignElementPadding) -
             locationBarFrame.origin.x;
-    locationBarFrame.size.height = kMaterialDesignToolbarButtonSize.height;
+    locationBarFrame.size.height = toolbarButtonSize.height;
     [locationBar_ setFrame:locationBarFrame];
+
+    // Correctly position the extension buttons' container view.
+    NSRect containerFrame = [browserActionsContainerView_ frame];
+    containerFrame.origin.y = locationBarFrame.origin.y;
+    containerFrame.size.height = toolbarButtonSize.height;
+    [browserActionsContainerView_ setFrame:containerFrame];
   } else {
     [[backButton_ cell] setImageID:IDR_BACK
                     forButtonState:image_button_cell::kDefaultState];
     [[backButton_ cell] setImageID:IDR_BACK_H
                     forButtonState:image_button_cell::kHoverState];
     [[backButton_ cell] setImageID:IDR_BACK_P
                     forButtonState:image_button_cell::kPressedState];
     [[backButton_ cell] setImageID:IDR_BACK_D
                     forButtonState:image_button_cell::kDisabledState];
 
@@ skipping 502 matching lines @@
   CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
   CGFloat leftDistance = 0.0;
 
   if ([browserActionsContainerView_ isHidden]) {
     CGFloat edgeXPos = [appMenuButton_ frame].origin.x;
     leftDistance = edgeXPos - locationBarXPos -
         [ToolbarController appMenuLeftPadding];
   } else {
     leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
         locationBarXPos;
+    // Equalize the distance between the location bar and the first extension
+    // button, and the distance between the location bar and home/reload button.
+    if (ui::MaterialDesignController::IsModeMaterial()) {
+      leftDistance -= 4;
+    }
   }
   if (leftDistance != 0.0)
     [self adjustLocationSizeBy:leftDistance animate:animate];
   else
     [locationBar_ stopAnimation];
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
@@ skipping 227 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end