cocoa browser: remove non-MD bookmark bar support

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_controller.h"
 
 #include <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 231 matching lines @@
 - (void)createOtherBookmarksButton;
 - (void)createAppsPageShortcutButton;
 - (void)openAppsPage:(id)sender;
 - (void)centerNoItemsLabel;
 - (void)positionRightSideButtons;
 - (void)watchForExitEvent:(BOOL)watch;
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate;
 
 @end
 
-namespace bookmarks {
-
-CGFloat BookmarkHorizontalPadding() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 1.0;
-  }
-  return 4.0;
-}
-
-CGFloat BookmarkVerticalPadding() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 2.0;
-  }
-  return 4.0;
-}
-
-CGFloat BookmarkLeftMargin() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 2.0;
-  }
-  return 8.0;
-}
-
-CGFloat BookmarkRightMargin() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 2.0;
-  }
-  return 8.0;
-}
-
-}  // namespace bookmarks
-
 @implementation BookmarkBarController
 
 @synthesize currentState = currentState_;
 @synthesize lastState = lastState_;
 @synthesize isAnimationRunning = isAnimationRunning_;
 @synthesize delegate = delegate_;
 @synthesize stateAnimationsEnabled = stateAnimationsEnabled_;
 @synthesize innerContentAnimationsEnabled = innerContentAnimationsEnabled_;
 
 - (id)initWithBrowser:(Browser*)browser
@@ skipping 12 matching lines @@
         ManagedBookmarkServiceFactory::GetForProfile(browser_->profile());
     buttons_.reset([[NSMutableArray alloc] init]);
     delegate_ = delegate;
     folderTarget_.reset(
         [[BookmarkFolderTarget alloc] initWithController:self
                                                  profile:browser_->profile()]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folderImage_.reset(
         rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      folderImageWhite_.reset(
-          rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_WHITE).CopyNSImage());
+    folderImageWhite_.reset(
+        rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_WHITE).CopyNSImage());
 
-      const int kIconSize = 16;
-      defaultImage_.reset([NSImageFromImageSkia(
-          gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_HTTP,
-                                kIconSize,
-                                gfx::kChromeIconGrey)) retain]);
-      defaultImageIncognito_.reset([NSImageFromImageSkia(
-          gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_HTTP,
-                                kIconSize,
-                                SkColorSetA(SK_ColorWHITE, 0xCC))) retain]);
-    } else {
-      defaultImage_.reset(
-          rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
-      defaultImageIncognito_.reset([defaultImage_.get() retain]);
-    }
+    const int kIconSize = 16;
+    defaultImage_.reset([NSImageFromImageSkia(
+        gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_HTTP,
+                              kIconSize,
+                              gfx::kChromeIconGrey)) retain]);
+    defaultImageIncognito_.reset([NSImageFromImageSkia(
+        gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_HTTP,
+                              kIconSize,
+                              SkColorSetA(SK_ColorWHITE, 0xCC))) retain]);
 
     innerContentAnimationsEnabled_ = YES;
     stateAnimationsEnabled_ = YES;
 
     // Register for theme changes, bookmark button pulsing, ...
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
     [defaultCenter addObserver:self
                       selector:@selector(themeDidChangeNotification:)
                           name:kBrowserThemeDidChangeNotification
                         object:nil];
@@ skipping 128 matching lines @@
     return;
   }
 
   // We default to NOT open, which means height=0.
   DCHECK([[self view] isHidden]);  // Hidden so it's OK to change.
 
   // Set our initial height to zero, since that is what the superview
   // expects.  We will resize ourselves open later if needed.
   [[self view] setFrame:NSMakeRect(0, 0, initialWidth_, 0)];
 
-  const bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
+  // Complete init of the "off the side" button, as much as we can.
+  [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
+  BookmarkButtonCell* offTheSideCell = [offTheSideButton_ cell];
+  [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+  [offTheSideCell setImagePosition:NSImageOnly];
 
-  // Complete init of the "off the side" button, as much as we can.
-  if (isModeMaterial) {
-    [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
-    BookmarkButtonCell* offTheSideCell = [offTheSideButton_ cell];
-    [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
-    [offTheSideCell setImagePosition:NSImageOnly];
-
-    // The cell is configured in the nib to draw a white highlight when clicked.
-    [offTheSideCell setHighlightsBy:NSNoCellMask];
-  } else {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    [offTheSideButton_ setImage:
-          rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_CHEVRONS).ToNSImage()];
-  }
+  // The cell is configured in the nib to draw a white highlight when clicked.
+  [offTheSideCell setHighlightsBy:NSNoCellMask];
   [offTheSideButton_.draggableButton setDraggable:NO];
   [offTheSideButton_.draggableButton setActsOnMouseDown:YES];
 
   // We are enabled by default.
   barIsEnabled_ = YES;
 
   // Remember the original sizes of the 'no items' and 'import bookmarks'
   // fields to aid in resizing when the window frame changes.
   originalNoItemsRect_ = [[buttonView_ noItemTextfield] frame];
   originalImportBookmarksRect_ = [[buttonView_ importBookmarksButton] frame];
-  if (isModeMaterial) {
-    // Bookmark buttons start farther from the bookmark bar's left edge so
-    // adjust the positions of the noItems and importBookmarks textfields.
-    const CGFloat kMaterialBookmarksTextfieldOffsetX = 14;
-    originalNoItemsRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
-    [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
 
-    originalImportBookmarksRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
-    [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
+  // Bookmark buttons start farther from the bookmark bar's left edge so
+  // adjust the positions of the noItems and importBookmarks textfields.
+  const CGFloat kBookmarksTextfieldOffsetX = 14;
+  originalNoItemsRect_.origin.x += kBookmarksTextfieldOffsetX;
+  [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
 
-    // Move the chevron button up 2pts from its position in the xib.
-    NSRect chevronButtonFrame = [offTheSideButton_ frame];
-    chevronButtonFrame.origin.y -= 2;
-    [offTheSideButton_ setFrame:chevronButtonFrame];
-  }
+  originalImportBookmarksRect_.origin.x += kBookmarksTextfieldOffsetX;
+  [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
+
+  // Move the chevron button up 2pts from its position in the xib.
+  NSRect chevronButtonFrame = [offTheSideButton_ frame];
+  chevronButtonFrame.origin.y -= 2;
+  [offTheSideButton_ setFrame:chevronButtonFrame];
 
   // To make life happier when the bookmark bar is floating, the chevron is a
   // child of the button view.
   [offTheSideButton_ removeFromSuperview];
   [buttonView_ addSubview:offTheSideButton_];
 
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
   [[self view] setPostsFrameChangedNotifications:YES];
   [[NSNotificationCenter defaultCenter]
@@ skipping 177 matching lines @@
 
   // In general, only show the divider when it's in the normal showing state.
   return [self isInState:BookmarkBar::SHOW] ? 0 : 1;
 }
 
 - (NSImage*)faviconForNode:(const BookmarkNode*)node
              forADarkTheme:(BOOL)forADarkTheme {
   if (!node)
     return forADarkTheme ? defaultImageIncognito_ : defaultImage_;
 
-  if (forADarkTheme && ui::MaterialDesignController::IsModeMaterial()) {
+  if (forADarkTheme) {
     if (node == managedBookmarkService_->managed_node()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       return rb.GetNativeImageNamed(
           IDR_BOOKMARK_BAR_FOLDER_MANAGED_WHITE).ToNSImage();
     }
 
     if (node == managedBookmarkService_->supervised_node()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       return rb.GetNativeImageNamed(
           IDR_BOOKMARK_BAR_FOLDER_SUPERVISED_WHITE).ToNSImage();
@@ skipping 208 matching lines @@
 
 - (BookmarkLaunchLocation)bookmarkLaunchLocation {
   return currentState_ == BookmarkBar::DETACHED ?
       BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR :
       BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR;
 }
 
 // Position the right-side buttons including the off-the-side chevron.
 - (void)positionRightSideButtons {
   int maxX = NSMaxX([[self buttonView] bounds]) -
-      bookmarks::BookmarkHorizontalPadding();
+      bookmarks::kBookmarkHorizontalPadding;
   int right = maxX;
 
   int ignored = 0;
   NSRect frame = [self frameForBookmarkButtonFromCell:
       [otherBookmarksButton_ cell] xOffset:&ignored];
   if (![otherBookmarksButton_ isHidden]) {
     right -= NSWidth(frame);
     frame.origin.x = right;
   } else {
     frame.origin.x = maxX - NSWidth(frame);
@@ skipping 181 matching lines @@
   seedId_ = 0;
   menuTagMap_.clear();
 }
 
 - (int)preferredHeight {
   DCHECK(![self isAnimationRunning]);
 
   if (!barIsEnabled_)
     return 0;
 
-  CGFloat lineWidth = 0;
-  BOOL isRetina = NO;
-  BOOL reduceHeight = NO;
-
   switch (currentState_) {
     case BookmarkBar::SHOW:
-      // When on a Retina display and not using Material Design,
-      // -[ToolbarController baseToolbarHeight] reduces the height of the
-      // toolbar by 1pt. In this case the bookmark bar needs to add 1pt of space
-      // above the bookmark icons in order to maintain the proper distance from
-      // toolbar items. See https://crbug.com/326245 .
-      lineWidth = [[self view] cr_lineWidth];
-      isRetina = (lineWidth < 1);
-
-      // Only adjust the height if Retina and not Material Design.
-      reduceHeight =
-          isRetina && !ui::MaterialDesignController::IsModeMaterial();
-
-      return reduceHeight ? chrome::kMinimumBookmarkBarHeight + 1
-                          : chrome::kMinimumBookmarkBarHeight;
+      return chrome::kMinimumBookmarkBarHeight;
     case BookmarkBar::DETACHED:
       return chrome::kNTPBookmarkBarHeight;
     case BookmarkBar::HIDDEN:
       return 0;
   }
 }
 
 // Recursively add the given bookmark node and all its children to
 // menu, one menu item per node.
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu {
@@ skipping 47 matching lines @@
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:title] autorelease];
   [self addFolderNode:node toMenu:menu];
 
   if (![menu numberOfItems]) {
     [self tagEmptyMenu:menu];
   }
   return menu;
 }
 
 // Return an appropriate width for the given bookmark button cell.
-// The "+2" is needed because, sometimes, Cocoa is off by a tad.
-// Example: for a bookmark named "Moma" or "SFGate", it is one pixel
-// too small.  For "FBL" it is 2 pixels too small.
-// For a bookmark named "SFGateFooWoo", it is just fine.
 - (CGFloat)widthForBookmarkButtonCell:(NSCell*)cell {
-  CGFloat desired = [cell cellSize].width;
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    desired += 2;
-  }
-  return std::min(desired, bookmarks::kDefaultBookmarkWidth);
+  return std::min([cell cellSize].width, bookmarks::kDefaultBookmarkWidth);
 }
 
 - (IBAction)openBookmarkMenuItem:(id)sender {
   int64_t tag = [self nodeIdFromMenuTag:[sender tag]];
   const BookmarkNode* node =
       bookmarks::GetBookmarkNodeByID(bookmarkModel_, tag);
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   [self openURL:node->url() disposition:disposition];
 }
 
 // For the given root node of the bookmark bar, show or hide (as
 // appropriate) the "no items" container (text which says "bookmarks
 // go here").
 - (void)showOrHideNoItemContainerForNode:(const BookmarkNode*)node {
   BOOL hideNoItemWarning = !node->empty();
   [[buttonView_ noItemContainer] setHidden:hideNoItemWarning];
 }
 
 // TODO(jrg): write a "build bar" so there is a nice spot for things
 // like the contextual menu which is invoked when not over a
 // bookmark.  On Safari that menu has a "new folder" option.
 - (void)addNodesToButtonList:(const BookmarkNode*)node {
   [self showOrHideNoItemContainerForNode:node];
 
   CGFloat maxViewX = NSMaxX([[self view] bounds]);
   int xOffset =
-      bookmarks::BookmarkLeftMargin() - bookmarks::BookmarkHorizontalPadding();
+      bookmarks::kBookmarkLeftMargin - bookmarks::kBookmarkHorizontalPadding;
 
   // Draw the apps bookmark if needed.
   if (![appsPageShortcutButton_ isHidden]) {
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[appsPageShortcutButton_ cell]
                                      xOffset:&xOffset];
     [appsPageShortcutButton_ setFrame:frame];
   }
 
   // Draw the managed bookmark folder if needed.
   if (![managedBookmarksButton_ isHidden]) {
-    xOffset += bookmarks::BookmarkHorizontalPadding();
+    xOffset += bookmarks::kBookmarkHorizontalPadding;
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[managedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [managedBookmarksButton_ setFrame:frame];
   }
 
   // Draw the supervised bookmark folder if needed.
   if (![supervisedBookmarksButton_ isHidden]) {
-    xOffset += bookmarks::BookmarkHorizontalPadding();
+    xOffset += bookmarks::kBookmarkHorizontalPadding;
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[supervisedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [supervisedBookmarksButton_ setFrame:frame];
   }
 
   for (int i = 0; i < node->child_count(); i++) {
     const BookmarkNode* child = node->GetChild(i);
     BookmarkButton* button = [self buttonForNode:child xOffset:&xOffset];
     if (NSMinX([button frame]) >= maxViewX) {
@@ skipping 56 matching lines @@
 }
 
 // Add bookmark buttons to the view only if they are completely
 // visible and don't overlap the "other bookmarks".  Remove buttons
 // which are clipped.  Called when building the bookmark bar the first time.
 - (void)addButtonsToView {
   displayedButtonCount_ = 0;
   NSMutableArray* buttons = [self buttons];
   for (NSButton* button in buttons) {
     if (NSMaxX([button frame]) > (NSMinX([offTheSideButton_ frame]) -
-                                  bookmarks::BookmarkHorizontalPadding()))
+                                  bookmarks::kBookmarkHorizontalPadding))
       break;
     [buttonView_ addSubview:button];
     ++displayedButtonCount_;
   }
   NSUInteger removalCount =
       [buttons count] - (NSUInteger)displayedButtonCount_;
   if (removalCount > 0) {
     NSRange removalRange = NSMakeRange(displayedButtonCount_, removalCount);
     [buttons removeObjectsInRange:removalRange];
   }
@@ skipping 363 matching lines @@
       [self shrinkOrHideView:noItemTextfield forMaxX:maxViewX];
   }
 }
 
 // Scans through all buttons from left to right, calculating from scratch where
 // they should be based on the preceding widths, until it finds the one
 // requested.
 // Returns NSZeroRect if there is no such button in the bookmark bar.
 // Enables you to work out where a button will end up when it is done animating.
 - (NSRect)finalRectOfButton:(BookmarkButton*)wantedButton {
-  CGFloat left = bookmarks::BookmarkLeftMargin();
+  CGFloat left = bookmarks::kBookmarkLeftMargin;
   NSRect buttonFrame = NSZeroRect;
 
   // Draw the apps bookmark if needed.
   if (![appsPageShortcutButton_ isHidden]) {
     left = NSMaxX([appsPageShortcutButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   }
 
   // Draw the managed bookmarks folder if needed.
   if (![managedBookmarksButton_ isHidden]) {
     left = NSMaxX([managedBookmarksButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   }
 
   // Draw the supervised bookmarks folder if needed.
   if (![supervisedBookmarksButton_ isHidden]) {
     left = NSMaxX([supervisedBookmarksButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   }
 
   for (NSButton* button in buttons_.get()) {
     // Hidden buttons get no space.
     if ([button isHidden])
       continue;
     buttonFrame = [button frame];
     buttonFrame.origin.x = left;
-    left += buttonFrame.size.width + bookmarks::BookmarkHorizontalPadding();
+    left += buttonFrame.size.width + bookmarks::kBookmarkHorizontalPadding;
     if (button == wantedButton)
       return buttonFrame;
   }
   return NSZeroRect;
 }
 
 // Calculates the final position of the last button in the bar.
 // We can't just use [[self buttons] lastObject] frame] because the button
 // may be animating currently.
 - (NSRect)finalRectOfLastButton {
   return [self finalRectOfButton:[[self buttons] lastObject]];
 }
 
 - (CGFloat)buttonViewMaxXWithOffTheSideButtonIsVisible:(BOOL)visible {
   CGFloat maxViewX = NSMaxX([buttonView_ bounds]);
   // If necessary, pull in the width to account for the Other Bookmarks button.
   if ([self setOtherBookmarksButtonVisibility]) {
     maxViewX = [otherBookmarksButton_ frame].origin.x -
-        bookmarks::BookmarkRightMargin();
+        bookmarks::kBookmarkRightMargin;
   }
 
   [self positionRightSideButtons];
   // If we're already overflowing, then we need to account for the chevron.
   if (visible) {
     maxViewX =
-        [offTheSideButton_ frame].origin.x - bookmarks::BookmarkRightMargin();
+        [offTheSideButton_ frame].origin.x - bookmarks::kBookmarkRightMargin;
   }
 
   return maxViewX;
 }
 
 - (void)redistributeButtonsOnBarAsNeeded {
   const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
   NSInteger barCount = node->child_count();
 
   // Determine the current maximum extent of the visible buttons.
@@ skipping 18 matching lines @@
       offTheSideButtonVisible = YES;
       maxViewX = [self buttonViewMaxXWithOffTheSideButtonIsVisible:YES];
     }
   }
 
   // As a result of cutting, deleting and dragging, the bar may now have room
   // for more buttons.
   int xOffset;
   if (displayedButtonCount_ > 0) {
     xOffset = NSMaxX([self finalRectOfLastButton]);
-
-    // Adding the padding here causes the distance between button 1 and 2 to
-    // be twice the padding instead of 1x. Pre-Material Design the padding was
-    // 1pt, so this bug was not noticeable. With MD's padding, this error puts
-    // 32pts of space between buttons.
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      xOffset += bookmarks::BookmarkHorizontalPadding();
-    }
   } else if (![managedBookmarksButton_ isHidden]) {
     xOffset = NSMaxX([managedBookmarksButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   } else if (![supervisedBookmarksButton_ isHidden]) {
     xOffset = NSMaxX([supervisedBookmarksButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   } else if (![appsPageShortcutButton_ isHidden]) {
     xOffset = NSMaxX([appsPageShortcutButton_ frame]) +
-        bookmarks::BookmarkHorizontalPadding();
+        bookmarks::kBookmarkHorizontalPadding;
   } else {
-    xOffset = bookmarks::BookmarkLeftMargin() -
-        bookmarks::BookmarkHorizontalPadding();
+    xOffset = bookmarks::kBookmarkLeftMargin -
+        bookmarks::kBookmarkHorizontalPadding;
   }
   for (int i = displayedButtonCount_; i < barCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     BookmarkButton* button = [self buttonForNode:child xOffset:&xOffset];
     // If we're testing against the last possible button then account
     // for the chevron no longer needing to be shown.
     if (i == barCount - 1)
       maxViewX = [self buttonViewMaxXWithOffTheSideButtonIsVisible:NO];
     if (NSMaxX([button frame]) > maxViewX) {
       [button setDelegate:nil];
@@ skipping 68 matching lines @@
 // TODO(jrg): move much of the cell config into the BookmarkButtonCell class.
 - (BookmarkButtonCell*)cellForBookmarkNode:(const BookmarkNode*)node {
   BOOL darkTheme = [[[self view] window] hasDarkTheme];
   NSImage* image = node ? [self faviconForNode:node forADarkTheme:darkTheme]
                         : nil;
   BookmarkButtonCell* cell =
       [BookmarkButtonCell buttonCellForNode:node
                                        text:nil
                                       image:image
                              menuController:contextMenuController_];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
-  } else {
-    [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
-  }
+  [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
 
   // Note: a quirk of setting a cell's text color is that it won't work
   // until the cell is associated with a button, so we can't theme the cell yet.
 
   return cell;
 }
 
 // Return an autoreleased NSCell suitable for a special button displayed on the
 // bookmark bar that is not attached to any bookmark node.
 // TODO(jrg): move much of the cell config into the BookmarkButtonCell class.
 - (BookmarkButtonCell*)cellForCustomButtonWithText:(NSString*)text
                                              image:(NSImage*)image {
   BookmarkButtonCell* cell =
       [BookmarkButtonCell buttonCellWithText:text
                                        image:image
                               menuController:contextMenuController_];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
-    [cell setHighlightsBy:NSNoCellMask];
-  } else {
-    [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
-  }
+  [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+  [cell setHighlightsBy:NSNoCellMask];
 
   // Note: a quirk of setting a cell's text color is that it won't work
   // until the cell is associated with a button, so we can't theme the cell yet.
 
   return cell;
 }
 
 // Returns a frame appropriate for the given bookmark cell, suitable
 // for creating an NSButton that will contain it.  |xOffset| is the X
 // offset for the frame; it is increased to be an appropriate X offset
 // for the next button.
 - (NSRect)frameForBookmarkButtonFromCell:(NSCell*)cell
                                  xOffset:(int*)xOffset {
   DCHECK(xOffset);
   NSRect bounds = [buttonView_ bounds];
   bounds.size.height = bookmarks::kBookmarkButtonHeight;
 
   NSRect frame = NSInsetRect(bounds,
-                             bookmarks::BookmarkHorizontalPadding(),
-                             bookmarks::BookmarkVerticalPadding());
+                             bookmarks::kBookmarkHorizontalPadding,
+                             bookmarks::kBookmarkVerticalPadding);
   frame.size.width = [self widthForBookmarkButtonCell:cell];
 
   // Add an X offset based on what we've already done
   frame.origin.x += *xOffset;
 
   // And up the X offset for next time.
   *xOffset = NSMaxX(frame);
 
   return frame;
 }
@@ skipping 281 matching lines @@
 // Set insertionPos_ and hasInsertionPos_, and make insertion space for a
 // hypothetical drop with the new button having a left edge of |where|.
 // Gets called only by our view.
 - (void)setDropInsertionPos:(CGFloat)where {
   if (!hasInsertionPos_ || where != insertionPos_) {
     insertionPos_ = where;
     hasInsertionPos_ = YES;
     CGFloat left;
     if (![supervisedBookmarksButton_ isHidden]) {
       left = NSMaxX([supervisedBookmarksButton_ frame]) +
-             bookmarks::BookmarkHorizontalPadding();
+             bookmarks::kBookmarkHorizontalPadding;
     } else if (![managedBookmarksButton_ isHidden]) {
       left = NSMaxX([managedBookmarksButton_ frame]) +
-             bookmarks::BookmarkHorizontalPadding();
+             bookmarks::kBookmarkHorizontalPadding;
     } else if (![appsPageShortcutButton_ isHidden]) {
       left = NSMaxX([appsPageShortcutButton_ frame]) +
-             bookmarks::BookmarkHorizontalPadding();
+             bookmarks::kBookmarkHorizontalPadding;
     } else {
-      left = bookmarks::BookmarkLeftMargin();
+      left = bookmarks::kBookmarkLeftMargin;
     }
     CGFloat paddingWidth = bookmarks::kDefaultBookmarkWidth;
     BookmarkButton* draggedButton = [BookmarkButton draggedButton];
     if (draggedButton) {
       paddingWidth = std::min(bookmarks::kDefaultBookmarkWidth,
                               NSWidth([draggedButton frame]));
     }
     // Put all the buttons where they belong, with all buttons to the right
     // of the insertion point shuffling right to make space for it.
     [NSAnimationContext beginGrouping];
     [[NSAnimationContext currentContext]
         setDuration:kDragAndDropAnimationDuration];
     for (NSButton* button in buttons_.get()) {
       // Hidden buttons get no space.
       if ([button isHidden])
         continue;
       NSRect buttonFrame = [button frame];
       buttonFrame.origin.x = left;
       // Update "left" for next time around.
       left += buttonFrame.size.width;
       if (left > insertionPos_)
         buttonFrame.origin.x += paddingWidth;
-      left += bookmarks::BookmarkHorizontalPadding();
+      left += bookmarks::kBookmarkHorizontalPadding;
       if (innerContentAnimationsEnabled_)
         [[button animator] setFrame:buttonFrame];
       else
         [button setFrame:buttonFrame];
     }
     [NSAnimationContext endGrouping];
   }
 }
 
 // Put all visible bookmark bar buttons in their normal locations, either with
 // or without animation according to the |animate| flag.
 // This is generally useful, so is called from various places internally.
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate {
 
   // Position the apps bookmark if needed.
-  CGFloat left = bookmarks::BookmarkLeftMargin();
+  CGFloat left = bookmarks::kBookmarkLeftMargin;
   if (![appsPageShortcutButton_ isHidden]) {
-    int xOffset = bookmarks::BookmarkLeftMargin() -
-            bookmarks::BookmarkHorizontalPadding();
+    int xOffset = bookmarks::kBookmarkLeftMargin -
+            bookmarks::kBookmarkHorizontalPadding;
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[appsPageShortcutButton_ cell]
                                      xOffset:&xOffset];
     [appsPageShortcutButton_ setFrame:frame];
-    left = xOffset + bookmarks::BookmarkHorizontalPadding();
+    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
   }
 
   // Position the managed bookmarks folder if needed.
   if (![managedBookmarksButton_ isHidden]) {
     int xOffset = left;
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[managedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [managedBookmarksButton_ setFrame:frame];
-    left = xOffset + bookmarks::BookmarkHorizontalPadding();
+    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
   }
 
   // Position the supervised bookmarks folder if needed.
   if (![supervisedBookmarksButton_ isHidden]) {
     int xOffset = left;
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[supervisedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [supervisedBookmarksButton_ setFrame:frame];
-    left = xOffset + bookmarks::BookmarkHorizontalPadding();
+    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
   }
 
   animate &= innerContentAnimationsEnabled_;
 
   for (NSButton* button in buttons_.get()) {
     // Hidden buttons get no space.
     if ([button isHidden])
       continue;
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.x = left;
-    left += buttonFrame.size.width + bookmarks::BookmarkHorizontalPadding();
+    left += buttonFrame.size.width + bookmarks::kBookmarkHorizontalPadding;
     if (animate)
       [[button animator] setFrame:buttonFrame];
     else
       [button setFrame:buttonFrame];
   }
 }
 
 // Clear insertion flag, remove insertion space and put all visible bookmark
 // bar buttons in their normal locations.
 // Gets called only by our view.
@@ skipping 275 matching lines @@
 }
 
 
 #pragma mark BookmarkButtonControllerProtocol
 
 // Close all bookmark folders.  "Folder" here is the fake menu for
 // bookmark folders, not a button context menu.
 - (void)closeAllBookmarkFolders {
   [self watchForExitEvent:NO];
 
-  // Grab the parent button under Material Design to make sure that the
-  // highlighting that was applied while revealing the menu is turned off.
-  BookmarkButton* parentButton = nil;
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    parentButton = [folderController_ parentButton];
-  }
+  // Grab the parent button under to make sure that the highlighting that was
+  // applied while revealing the menu is turned off.
+  BookmarkButton* parentButton = [folderController_ parentButton];
   [folderController_ close];
   [parentButton setNeedsDisplay:YES];
   folderController_ = nil;
 }
 
 - (void)closeBookmarkFolder:(id)sender {
   // We're the top level, so close one means close them all.
   [self closeAllBookmarkFolders];
 }
 
@@ skipping 124 matching lines @@
 }
 
 // Return YES if we should show the drop indicator, else NO.
 - (BOOL)shouldShowIndicatorShownForPoint:(NSPoint)point {
   return ![self buttonForDroppingOnAtPoint:point];
 }
 
 // Return the x position for a drop indicator.
 - (CGFloat)indicatorPosForDragToPoint:(NSPoint)point {
   CGFloat x = 0;
-  CGFloat halfHorizontalPadding = 0.5 * bookmarks::BookmarkHorizontalPadding();
+  CGFloat halfHorizontalPadding = 0.5 * bookmarks::kBookmarkHorizontalPadding;
   int destIndex = [self indexForDragToPoint:point];
   int numButtons = displayedButtonCount_;
 
   CGFloat leftmostX;
   if (![supervisedBookmarksButton_ isHidden]) {
     leftmostX =
         NSMaxX([supervisedBookmarksButton_ frame]) + halfHorizontalPadding;
   } else if (![managedBookmarksButton_ isHidden]) {
     leftmostX = NSMaxX([managedBookmarksButton_ frame]) + halfHorizontalPadding;
   } else if (![appsPageShortcutButton_ isHidden]) {
     leftmostX = NSMaxX([appsPageShortcutButton_ frame]) + halfHorizontalPadding;
   } else {
-    leftmostX = bookmarks::BookmarkLeftMargin() - halfHorizontalPadding;
+    leftmostX = bookmarks::kBookmarkLeftMargin - halfHorizontalPadding;
   }
 
   // If it's a drop strictly between existing buttons ...
   if (destIndex == 0) {
     x = leftmostX;
   } else if (destIndex > 0 && destIndex < numButtons) {
     // ... put the indicator right between the buttons.
     BookmarkButton* button =
         [buttons_ objectAtIndex:static_cast<NSUInteger>(destIndex-1)];
     DCHECK(button);
@@ skipping 74 matching lines @@
 - (void)openAll:(const BookmarkNode*)node
     disposition:(WindowOpenDisposition)disposition {
   [self closeFolderAndStopTrackingMenus];
   chrome::OpenAll([[self view] window], browser_, node, disposition,
                   browser_->profile());
 }
 
 - (void)addButtonForNode:(const BookmarkNode*)node
                  atIndex:(NSInteger)buttonIndex {
   int newOffset =
-      bookmarks::BookmarkLeftMargin() - bookmarks::BookmarkHorizontalPadding();
+      bookmarks::kBookmarkLeftMargin - bookmarks::kBookmarkHorizontalPadding;
   if (buttonIndex == -1)
     buttonIndex = [buttons_ count];  // New button goes at the end.
   if (buttonIndex <= (NSInteger)[buttons_ count]) {
     if (buttonIndex) {
       BookmarkButton* targetButton = [buttons_ objectAtIndex:buttonIndex - 1];
       NSRect targetFrame = [targetButton frame];
       newOffset = targetFrame.origin.x + NSWidth(targetFrame) +
-          bookmarks::BookmarkHorizontalPadding();
+          bookmarks::kBookmarkHorizontalPadding;
     }
     BookmarkButton* newButton = [self buttonForNode:node xOffset:&newOffset];
     ++displayedButtonCount_;
     [buttons_ insertObject:newButton atIndex:buttonIndex];
     [buttonView_ addSubview:newButton];
     [self resetAllButtonPositionsWithAnimation:NO];
     // See if any buttons need to be pushed off to or brought in from the side.
     [self reconfigureBookmarkBar];
   } else  {
     // A button from somewhere else (not the bar) is being moved to the
@@ skipping 121 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end