Implement Material Design for Mac 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 20 matching lines @@
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #include "chrome/browser/ui/cocoa/drag_util.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
+#import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/menu_controller.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 // Duration of the toolbar animation.
 const NSTimeInterval kToolBarAnimationDuration = 0.12;
 
-// Height of the location bar. Used for animating the toolbar in and out when
-// the location bar is displayed stand-alone for bookmark apps.
-const CGFloat kLocationBarHeight = 29.0;
+// The size of toolbar buttons in Material Design.
+const NSSize kMaterialDesignToolbarButtonSize = NSMakeSize(28, 28);
 
-// The padding above the toolbar elements. This is calculated from the values
-// in Toolbar.xib: the height of the toolbar (35) minus the height of the child
-// elements (29) minus the y-origin of the elements (4).
-const CGFloat kToolbarElementTopPadding = 2.0;
+// 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;
 
-// The amount of left padding that the app menu should have.
-const CGFloat kAppMenuLeftPadding = 3.0;
-
 class BrowserActionsContainerDelegate :
     public BrowserActionsContainerViewSizeDelegate {
  public:
   BrowserActionsContainerDelegate(
       AutocompleteTextField* location_bar,
       BrowserActionsContainerView* browser_actions_container_view);
   ~BrowserActionsContainerDelegate() override;
 
  private:
   // BrowserActionsContainerSizeDelegate:
@@ skipping 20 matching lines @@
 CGFloat BrowserActionsContainerDelegate::GetMaxAllowedWidth() {
   CGFloat location_bar_flex =
       NSWidth([location_bar_ frame]) - kMinimumLocationBarWidth;
   return NSWidth([browser_actions_container_ frame]) + location_bar_flex;
 }
 
 }  // namespace
 
 @interface ToolbarController()
 @property(assign, nonatomic) Browser* browser;
+// Height of the location bar. Used for animating the toolbar in and out when
+// the location bar is displayed stand-alone for bookmark apps.
++ (CGFloat)locationBarHeight;
+// Return the amount of left padding that the app menu should have.
++ (CGFloat)appMenuLeftPadding;
 - (void)cleanUp;
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(const std::string&)prefName;
 - (ToolbarView*)toolbarView;
+// Height of the toolbar in pixels when the bookmark bar is closed.
+- (CGFloat)baseToolbarHeight;
 - (void)toolbarFrameChanged;
 - (void)showLocationBarOnly;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
 - (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
@@ skipping 58 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NotificationBridge);
 };
 
 }  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 @synthesize browser = browser_;
 
++ (CGFloat)locationBarHeight {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 29;
+  }
+
+  return kMaterialDesignLocationBarHeight;
+}
+
++ (CGFloat)appMenuLeftPadding {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 3;
+  }
+
+  return kMaterialDesignElementPadding;
+}
+
 - (id)initWithCommands:(CommandUpdater*)commands
                profile:(Profile*)profile
                browser:(Browser*)browser
         resizeDelegate:(id<ViewResizer>)resizeDelegate {
   DCHECK(commands && profile);
   if ((self = [super initWithNibName:@"Toolbar"
                               bundle:base::mac::FrameworkBundle()])) {
     commands_ = commands;
     profile_ = profile;
     browser_ = browser;
@@ skipping 32 matching lines @@
 }
 
 - (void)viewDidLoad {
   // When linking and running on 10.10+, both -awakeFromNib and -viewDidLoad may
   // be called, don't initialize twice.
   if (locationBarView_) {
     DCHECK(base::mac::IsOSYosemiteOrLater());
     return;
   }
 
-  [[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];
+  // Make Material Design layout adjustments to the NIB items.
+  bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+  if (isModeMaterial) {
+    ToolbarView* toolbarView = [self toolbarView];
 
-  [[forwardButton_ cell] setImageID:IDR_FORWARD
-                     forButtonState:image_button_cell::kDefaultState];
-  [[forwardButton_ cell] setImageID:IDR_FORWARD_H
-                     forButtonState:image_button_cell::kHoverState];
-  [[forwardButton_ cell] setImageID:IDR_FORWARD_P
-                     forButtonState:image_button_cell::kPressedState];
-  [[forwardButton_ cell] setImageID:IDR_FORWARD_D
-                     forButtonState:image_button_cell::kDisabledState];
+    // Set the toolbar height.
+    NSRect frame = [toolbarView frame];
+    frame.size.height = [self baseToolbarHeight];
+    [toolbarView setFrame:frame];
 
-  [[reloadButton_ cell] setImageID:IDR_RELOAD
+    NSRect backButtonFrame = [backButton_ frame];
+    backButtonFrame.origin.x = kMaterialDesignElementPadding;
+    backButtonFrame.origin.y -= 1;
+    backButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    [backButton_ setFrame:backButtonFrame];
+
+    NSRect forwardButtonFrame = [forwardButton_ frame];
+    forwardButtonFrame.origin.x = NSMaxX(backButtonFrame);
+    forwardButtonFrame.origin.y = backButtonFrame.origin.y;
+    forwardButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    [forwardButton_ setFrame:forwardButtonFrame];
+
+    NSRect reloadButtonFrame = [reloadButton_ frame];
+    reloadButtonFrame.origin.x = NSMaxX(forwardButtonFrame);
+    reloadButtonFrame.origin.y = forwardButtonFrame.origin.y;
+    reloadButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    [reloadButton_ setFrame:reloadButtonFrame];
+
+    NSRect homeButtonFrame = [homeButton_ frame];
+    homeButtonFrame.origin.x = NSMaxX(reloadButtonFrame);
+    homeButtonFrame.origin.y = reloadButtonFrame.origin.y;
+    homeButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    [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;
+    menuButtonFrame.origin.y = homeButtonFrame.origin.y;
+    menuButtonFrame.size = kMaterialDesignToolbarButtonSize;
+    [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;
+    [locationBar_ setFrame:locationBarFrame];
+  } else {
+    [[backButton_ cell] setImageID:IDR_BACK
                     forButtonState:image_button_cell::kDefaultState];
-  [[reloadButton_ cell] setImageID:IDR_RELOAD_H
+    [[backButton_ cell] setImageID:IDR_BACK_H
                     forButtonState:image_button_cell::kHoverState];
-  [[reloadButton_ cell] setImageID:IDR_RELOAD_P
+    [[backButton_ cell] setImageID:IDR_BACK_P
+                    forButtonState:image_button_cell::kPressedState];
+    [[backButton_ cell] setImageID:IDR_BACK_D
+                    forButtonState:image_button_cell::kDisabledState];
+
+    [[forwardButton_ cell] setImageID:IDR_FORWARD
+                       forButtonState:image_button_cell::kDefaultState];
+    [[forwardButton_ cell] setImageID:IDR_FORWARD_H
+                       forButtonState:image_button_cell::kHoverState];
+    [[forwardButton_ cell] setImageID:IDR_FORWARD_P
+                       forButtonState:image_button_cell::kPressedState];
+    [[forwardButton_ cell] setImageID:IDR_FORWARD_D
+                       forButtonState:image_button_cell::kDisabledState];
+
+    [[reloadButton_ cell] setImageID:IDR_RELOAD
+                      forButtonState:image_button_cell::kDefaultState];
+    [[reloadButton_ cell] setImageID:IDR_RELOAD_H
+                      forButtonState:image_button_cell::kHoverState];
+    [[reloadButton_ cell] setImageID:IDR_RELOAD_P
+                      forButtonState:image_button_cell::kPressedState];
+
+    [[homeButton_ cell] setImageID:IDR_HOME
+                    forButtonState:image_button_cell::kDefaultState];
+    [[homeButton_ cell] setImageID:IDR_HOME_H
+                    forButtonState:image_button_cell::kHoverState];
+    [[homeButton_ cell] setImageID:IDR_HOME_P
                     forButtonState:image_button_cell::kPressedState];
 
-  [[homeButton_ cell] setImageID:IDR_HOME
-                  forButtonState:image_button_cell::kDefaultState];
-  [[homeButton_ cell] setImageID:IDR_HOME_H
-                  forButtonState:image_button_cell::kHoverState];
-  [[homeButton_ cell] setImageID:IDR_HOME_P
-                  forButtonState:image_button_cell::kPressedState];
+    [[appMenuButton_ cell] setImageID:IDR_TOOLS
+                       forButtonState:image_button_cell::kDefaultState];
+    [[appMenuButton_ cell] setImageID:IDR_TOOLS_H
+                       forButtonState:image_button_cell::kHoverState];
+    [[appMenuButton_ cell] setImageID:IDR_TOOLS_P
+                       forButtonState:image_button_cell::kPressedState];
 
-  [[appMenuButton_ cell] setImageID:IDR_TOOLS
-                     forButtonState:image_button_cell::kDefaultState];
-  [[appMenuButton_ cell] setImageID:IDR_TOOLS_H
-                     forButtonState:image_button_cell::kHoverState];
-  [[appMenuButton_ cell] setImageID:IDR_TOOLS_P
-                     forButtonState:image_button_cell::kPressedState];
+    // Adjust the toolbar height if running on Retina - see the comment in
+    // -baseToolbarHeight.
+    CGFloat toolbarHeight = [self baseToolbarHeight];
+    ToolbarView* toolbarView = [self toolbarView];
+    NSRect toolbarFrame = [toolbarView frame];
+    if (toolbarFrame.size.height != toolbarHeight) {
+      toolbarFrame.size.height = toolbarHeight;
+      [toolbarView setFrame:toolbarFrame];
+    }
+  }
 
   notificationBridge_.reset(
       new ToolbarControllerInternal::NotificationBridge(self));
   notificationBridge_->UpdateBadgeSeverity();
 
   [appMenuButton_ setOpenMenuOnClick:YES];
 
   [backButton_ setOpenMenuOnRightClick:YES];
   [forwardButton_ setOpenMenuOnRightClick:YES];
 
   [backButton_ setHandleMiddleClick:YES];
   [forwardButton_ setHandleMiddleClick:YES];
   [reloadButton_ setHandleMiddleClick:YES];
   [homeButton_ setHandleMiddleClick:YES];
 
   [self initCommandStatus:commands_];
   [reloadButton_ setCommandUpdater:commands_];
 
   locationBarView_.reset(new LocationBarViewMac(locationBar_, commands_,
                                                 profile_, browser_));
-  [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-
-  // Adjust the toolbar height if running on Retina - see the comment in
-  // -baseToolbarHeight.
-  CGFloat toolbarHeight = [self baseToolbarHeight];
-  NSRect toolbarFrame = [[locationBar_ superview] frame];
-  if (toolbarFrame.size.height != toolbarHeight) {
-    toolbarFrame.size.height = toolbarHeight;
-    [[locationBar_ superview] setFrame:toolbarFrame];
+  [locationBar_ setFont:[NSFont systemFontOfSize:14]];
+  if (!isModeMaterial) {
+    [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
   }
 
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar based on those prefs.
   PrefService* prefs = profile_->GetPrefs();
   showHomeButton_.Init(
       prefs::kShowHomeButton, prefs,
       base::Bind(
           &ToolbarControllerInternal::NotificationBridge::OnPreferenceChanged,
           base::Unretained(notificationBridge_.get())));
@@ skipping 307 matching lines @@
   // Ignore this message if only showing the URL bar.
   if (!hasToolbar_)
     return;
   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 - 1.0;
+  CGFloat moveX = [homeButton_ frame].size.width;
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    moveX -= 1.0;
+  }
   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
 // can be done every time the buttons are shown.
 - (void)installAppMenu {
   if (appMenuController_.get())
     return;
 
   appMenuController_.reset(
       [[AppMenuController alloc] initWithBrowser:browser_]);
   [appMenuController_ setUseWithPopUpButtonCell:YES];
   [appMenuButton_ setAttachedMenu:[appMenuController_ menu]];
 }
 
 - (void)updateAppMenuButtonSeverity:(AppMenuIconPainter::Severity)severity
                             animate:(BOOL)animate {
-  AppToolbarButtonCell* cell =
-      base::mac::ObjCCastStrict<AppToolbarButtonCell>([appMenuButton_ cell]);
-  [cell setSeverity:severity shouldAnimate:animate];
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    AppToolbarButtonCell* cell =
+        base::mac::ObjCCastStrict<AppToolbarButtonCell>([appMenuButton_ cell]);
+    [cell setSeverity:severity shouldAnimate:animate];
+    return;
+  }
+  AppToolbarButton* appMenuButton =
+      base::mac::ObjCCastStrict<AppToolbarButton>(appMenuButton_);
+  [appMenuButton setSeverity:severity shouldAnimate:animate];
 }
 
 - (void)prefChanged:(const std::string&)prefName {
   if (prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
   if (!browserActionsController_.get()) {
@@ skipping 23 matching lines @@
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
   if (![browserActionsContainerView_ isHidden])
     [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate {
-  CGFloat newHeight = visible ? kLocationBarHeight : 0;
+  CGFloat newHeight = visible ? [ToolbarController locationBarHeight] : 0;
 
   // Perform the animation, which will cause the BrowserWindowController to
   // resize this view in the browser layout as required.
   if (animate) {
     [[self toolbarView] animateToNewHeight:newHeight
                                   duration:kToolBarAnimationDuration];
   } else {
     [[self toolbarView] setHeight:newHeight];
   }
 }
@@ skipping 18 matching lines @@
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
   CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
   CGFloat leftDistance = 0.0;
 
   if ([browserActionsContainerView_ isHidden]) {
     CGFloat edgeXPos = [appMenuButton_ frame].origin.x;
-    leftDistance = edgeXPos - locationBarXPos - kAppMenuLeftPadding;
+    leftDistance = edgeXPos - locationBarXPos -
+        [ToolbarController appMenuLeftPadding];
   } else {
     leftDistance = NSMinX([browserActionsContainerView_ animationEndFrame]) -
         locationBarXPos;
   }
   if (leftDistance != 0.0)
     [self adjustLocationSizeBy:leftDistance animate:animate];
   else
     [locationBar_ stopAnimation];
 }
 
@@ skipping 11 matching lines @@
   // present.
   if (!browserActionsController_.get())
     return;
 
   if ([browserActionsContainerView_ isAnimating]) {
     // If the browser actions container is animating, we need to stop it first,
     // because the frame it's animating for could be incorrect with the new
     // bounds (if, for instance, the bookmark bar was added).
     // This will advance to the end of the animation, so we also need to adjust
     // it afterwards.
+    CGFloat elementTopPadding = kMaterialDesignElementPadding;
+    if (!ui::MaterialDesignController::IsModeMaterial()) {
+      // Pre-Material Design, this value is calculated from the values in
+      // Toolbar.xib: the height of the toolbar (35) minus the height of the
+      // child elements (29) minus the y-origin of the elements (4).
+      elementTopPadding = 2;
+    }
     [browserActionsContainerView_ stopAnimation];
     NSRect containerFrame = [browserActionsContainerView_ frame];
     containerFrame.origin.y =
         NSHeight([[self view] frame]) - NSHeight(containerFrame) -
-        kToolbarElementTopPadding;
+        elementTopPadding;
     [browserActionsContainerView_ setFrame:containerFrame];
     [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
   }
 
   [self maintainMinimumLocationBarWidth];
 
   if (locationBarAtMinSize_) {
     // Once the grippy is pinned, leave it until it is explicity un-pinned.
     [browserActionsContainerView_ setGrippyPinned:YES];
     NSRect containerFrame = [browserActionsContainerView_ frame];
@@ skipping 32 matching lines @@
 // to the toolbar or location bar width should be made. This message is
 // invalid if the toolbar is shown or the location bar is hidden.
 - (void)showLocationBarOnly {
   // -showLocationBarOnly is only ever called once, shortly after
   // initialization, so the regular buttons should all be visible.
   DCHECK(!hasToolbar_ && hasLocationBar_);
   DCHECK(![backButton_ isHidden]);
 
   // Ensure the location bar fills the toolbar.
   NSRect toolbarFrame = [[self view] frame];
-  toolbarFrame.size.height = kLocationBarHeight;
+  toolbarFrame.size.height = [ToolbarController locationBarHeight];
   [[self view] setFrame:toolbarFrame];
 
   [locationBar_ setFrame:NSMakeRect(0, 0, NSWidth([[self view] frame]),
-                                    kLocationBarHeight)];
+                                    [ToolbarController locationBarHeight])];
 
   [backButton_ setHidden:YES];
   [forwardButton_ setHidden:YES];
   [reloadButton_ setHidden:YES];
   [appMenuButton_ setHidden:YES];
   [homeButton_ setHidden:YES];
 }
 
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate {
   // Ensure that the location bar is in its proper place.
@@ skipping 27 matching lines @@
 - (NSPoint)saveCreditCardBubblePoint {
   return locationBarView_->GetSaveCreditCardBubblePoint();
 }
 
 - (NSPoint)translateBubblePoint {
   return locationBarView_->GetTranslateBubblePoint();
 }
 
 - (CGFloat)baseToolbarHeight {
   // Height of the toolbar in pixels when the bookmark bar is closed.
-  const CGFloat baseToolbarHeightNormal = 35.0;
+  const CGFloat baseToolbarHeightNormal =
+      ui::MaterialDesignController::IsModeMaterial() ? 37 : 35;
 
   // Not all lines are drawn at 2x normal height when running on Retina, which
   // causes the toolbar controls to be visually 1pt too high within the toolbar
   // area. It's not possible to adjust the control y-positions by 0.5pt and have
   // them appear 0.5pt lower (they are still drawn at their original locations),
   // so instead shave off 1pt from the bottom of the toolbar. Note that there's
   // an offsetting change in -[BookmarkBarController preferredHeight] to
   // maintain the proper spacing between bookmark icons and toolbar items. See
   // https://crbug.com/326245 .
   return [[self view] cr_lineWidth] == 0.5 ? baseToolbarHeightNormal - 1
@@ skipping 81 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end