| Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| index 423babf0c572afd77141ad7c1fba8debc989b1af..a0122c82aa37ec0950454523bc60a48b22b41c6a 100644
|
| --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| @@ -368,6 +368,10 @@ class NotificationBridge : public AppMenuIconController::Delegate {
|
| 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 =
|
| @@ -798,6 +802,9 @@ class NotificationBridge : public AppMenuIconController::Delegate {
|
| 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.
|
|
|