[Mac][Material Design] Center elements within the toolbar.

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 63 matching lines @@
 using content::WebContents;
 
 namespace {
 
 // Duration of the toolbar animation.
 const NSTimeInterval kToolBarAnimationDuration = 0.12;
 
 // The height of the location bar in Material Design.
 const CGFloat kMaterialDesignLocationBarHeight = 28;
 
+// The padding between the top of the toolbar and the top of the
+// location bar.
+const CGFloat kMaterialDesignLocationBarPadding = 2;
+
 // The padding between Material Design elements and the edges of the toolbar.
 const CGFloat kMaterialDesignElementPadding = 4;
 
 // Toolbar buttons are 24x24 and centered in a 28x28 space, so there is a 2pt-
 // wide inset.
 const CGFloat kMaterialDesignButtonInset = 2;
 
 // The y-offset of the browser actions container from the location bar.
 const CGFloat kMaterialDesignContainerYOffset = 2;
 
@@ skipping 207 matching lines @@
 
     // Set the toolbar height.
     NSRect frame = [toolbarView frame];
     frame.size.height = [self baseToolbarHeight];
     [toolbarView setFrame:frame];
 
     NSRect backButtonFrame = [backButton_ frame];
     backButtonFrame.origin.x =
         kMaterialDesignElementPadding + kMaterialDesignButtonInset;
     backButtonFrame.origin.y = NSMaxY(toolbarBounds) -
-        kMaterialDesignElementPadding - kMaterialDesignButtonInset -
-            toolbarButtonSize.height;
+        kMaterialDesignElementPadding - toolbarButtonSize.height;
     backButtonFrame.size = toolbarButtonSize;
     [backButton_ setFrame:backButtonFrame];
 
     NSRect forwardButtonFrame = [forwardButton_ frame];
     forwardButtonFrame.origin.x =
         NSMaxX(backButtonFrame) + 2 * kMaterialDesignButtonInset;
     forwardButtonFrame.origin.y = backButtonFrame.origin.y;
     forwardButtonFrame.size = toolbarButtonSize;
     [forwardButton_ setFrame:forwardButtonFrame];
 
@@ skipping 31 matching lines @@
     menuButtonFrame.origin.y = homeButtonFrame.origin.y;
     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) +
         kMaterialDesignButtonInset;
     locationBarFrame.origin.y = NSMaxY(toolbarBounds) -
-        kMaterialDesignElementPadding - kMaterialDesignLocationBarHeight;
+        kMaterialDesignLocationBarPadding - kMaterialDesignLocationBarHeight;
     locationBarFrame.size.width =
         menuButtonFrame.origin.x -
             locationBarFrame.origin.x;
     locationBarFrame.size.height = kMaterialDesignLocationBarHeight;
     [locationBar_ setFrame:locationBarFrame];
 
     // Correctly position the extension buttons' container view.
     NSRect containerFrame = [browserActionsContainerView_ frame];
     containerFrame.size.width += kMaterialDesignButtonInset;
     containerFrame.origin.y =
@@ skipping 777 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end