[Mac][Material Design] Increase space between home button and Omnibox.

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 350 matching lines @@
             toolbarButtonSize.width;
     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;
+    if (![homeButton_ isHidden]) {
+      // Ensure proper spacing between the home button and the location bar.
+      locationBarFrame.origin.x += kMaterialDesignElementPadding;
+    }
     locationBarFrame.origin.y = NSMaxY(toolbarBounds) -
         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];
@@ skipping 410 matching lines @@
   BOOL hide = showHomeButton_.GetValue() ? NO : YES;
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the text field by the width of the home button minus one pixel
   // since the frame edges of each button are right on top of each other. When
   // hiding the button, reverse the direction of the movement (to the left).
   CGFloat moveX = [homeButton_ frame].size.width;
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     moveX -= 1.0;
+  } else {
+    // Ensure proper spacing between the home button and the location bar.
+    moveX += kMaterialDesignElementPadding;
   }
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Install the app menu buttons. Calling this repeatedly is inexpensive so it
@@ skipping 368 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end