Reland of [Mac][Material Design] Update bookmarks bar to Material Design.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 0b7f2aa3064225b9d7d285f20af5f54590e44202..b1d1d91b6dbc129fc2dfdd0d31ea639cae5a91c4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -67,8 +67,13 @@
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 
 using base::UserMetricsAction;
@@ -244,6 +249,38 @@
 
 @end
 
+namespace bookmarks {
+
+CGFloat BookmarkHorizontalPadding() {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 1.0;
+  }
+  return 16.0;
+}
+
+CGFloat BookmarkVerticalPadding() {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 2.0;
+  }
+  return 4.0;
+}
+
+CGFloat BookmarkLeftMargin() {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 2.0;
+  }
+  return 10.0;
+}
+
+CGFloat BookmarkRightMargin() {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return 2.0;
+  }
+  return 10.0;
+}
+
+}  // namespace bookmarks
+
 @implementation BookmarkBarController
 
 @synthesize currentState = currentState_;
@@ -275,6 +312,10 @@
     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());
+    }
     defaultImage_.reset(
         rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).CopyNSImage());
 
@@ -425,12 +466,21 @@
   // 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.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  [offTheSideButton_ setImage:
-        rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_CHEVRONS).ToNSImage()];
-  [offTheSideButton_.draggableButton setDraggable:NO];
-  [offTheSideButton_.draggableButton setActsOnMouseDown:YES];
+  if (isModeMaterial) {
+    [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
+    BookmarkButtonCell* offTheSideCell = [offTheSideButton_ cell];
+    [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+    [offTheSideCell setImagePosition:NSImageOnly];
+  } else {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    [offTheSideButton_ setImage:
+          rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_CHEVRONS).ToNSImage()];
+    [offTheSideButton_.draggableButton setDraggable:NO];
+    [offTheSideButton_.draggableButton setActsOnMouseDown:YES];
+  }
 
   // We are enabled by default.
   barIsEnabled_ = YES;
@@ -439,6 +489,24 @@
   // fields to aid in resizing when the window frame changes.
   originalNoItemsRect_ = [[buttonView_ noItemTextfield] frame];
   originalImportBookmarksRect_ = [[buttonView_ importBookmarksButton] frame];
+  if (isModeMaterial) {
+    // Bookmark buttons are shorter and start farther from the bookmark bar's
+    // left edge so adjust the positions of the noItems and importBookmarks
+    // textfields.
+    const CGFloat kMaterialBookmarksTextfieldOffsetX = 14;
+    const CGFloat kMaterialBookmarksTextfieldOffsetY = -2;
+    originalNoItemsRect_.origin =
+        NSOffsetRect(originalNoItemsRect_,
+                     kMaterialBookmarksTextfieldOffsetX,
+                     kMaterialBookmarksTextfieldOffsetY).origin;
+    [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
+
+    originalImportBookmarksRect_.origin =
+        NSOffsetRect(originalImportBookmarksRect_,
+                     kMaterialBookmarksTextfieldOffsetX,
+                     kMaterialBookmarksTextfieldOffsetY).origin;
+    [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
+  }
 
   // To make life happier when the bookmark bar is floating, the chevron is a
   // child of the button view.
@@ -533,7 +601,12 @@
   // Add padding to the detached bookmark bar.
   // The state of our morph (if any); 1 is total bubble, 0 is the regular bar.
   CGFloat morph = [self detachedMorphProgress];
-  CGFloat padding = bookmarks::kNTPBookmarkBarPadding;
+  CGFloat padding = 0;
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    padding = bookmarks::kMaterialNTPBookmarkBarPadding;
+  } else {
+    padding = bookmarks::kNTPBookmarkBarPadding;
+  }
   buttonViewFrame =
       NSInsetRect(buttonViewFrame, morph * padding, morph * padding);
 
@@ -630,25 +703,44 @@
   return [self isInState:BookmarkBar::SHOW] ? 0 : 1;
 }
 
-- (NSImage*)faviconForNode:(const BookmarkNode*)node {
+- (NSImage*)faviconForNode:(const BookmarkNode*)node
+             forADarkTheme:(BOOL)forADarkTheme {
   if (!node)
     return defaultImage_;
 
-  if (node == managedBookmarkService_->managed_node()) {
-    // Most users never see this node, so the image is only loaded if needed.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    return rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage();
-  }
-
-  if (node == managedBookmarkService_->supervised_node()) {
-    // Most users never see this node, so the image is only loaded if needed.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    return rb.GetNativeImageNamed(
-        IDR_BOOKMARK_BAR_FOLDER_SUPERVISED).ToNSImage();
-  }
-
-  if (node->is_folder())
-    return folderImage_;
+  if (forADarkTheme && ui::MaterialDesignController::IsModeMaterial()) {
+    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();
+    }
+
+    if (node->is_folder())
+      return folderImageWhite_;
+  } else {
+    if (node == managedBookmarkService_->managed_node()) {
+      // Most users never see this node, so the image is only loaded if needed.
+      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      return rb.GetNativeImageNamed(
+          IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage();
+    }
+
+    if (node == managedBookmarkService_->supervised_node()) {
+      // Most users never see this node, so the image is only loaded if needed.
+      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      return rb.GetNativeImageNamed(
+          IDR_BOOKMARK_BAR_FOLDER_SUPERVISED).ToNSImage();
+    }
+
+    if (node->is_folder())
+      return folderImage_;
+  }
 
   const gfx::Image& favicon = bookmarkModel_->GetFavicon(node);
   if (!favicon.IsEmpty())
@@ -811,6 +903,20 @@
   chrome::ShowImportDialog(browser_);
 }
 
+- (NSButton*)offTheSideButton {
+  return offTheSideButton_;
+}
+
+- (NSImage*)offTheSideButtonImage:(BOOL)forDarkMode {
+  const int kIconSize = 16;
+  SkColor vectorIconColor = forDarkMode ? SkColorSetA(SK_ColorWHITE, 0xCC)
+                                        : gfx::kChromeIconGrey;
+  return NSImageFromImageSkia(
+      gfx::CreateVectorIcon(gfx::VectorIconId::OVERFLOW_CHEVRON,
+                            kIconSize,
+                            vectorIconColor));
+}
+
 #pragma mark Private Methods
 
 // Called after a theme change took place, possibly for a different profile.
@@ -827,7 +933,7 @@
 // Position the right-side buttons including the off-the-side chevron.
 - (void)positionRightSideButtons {
   int maxX = NSMaxX([[self buttonView] bounds]) -
-      bookmarks::kBookmarkHorizontalPadding;
+      bookmarks::BookmarkHorizontalPadding();
   int right = maxX;
 
   int ignored = 0;
@@ -1052,7 +1158,7 @@
                                                  action:nil
                                           keyEquivalent:@""] autorelease];
   [menu addItem:item];
-  [item setImage:[self faviconForNode:child]];
+  [item setImage:[self faviconForNode:child forADarkTheme:NO]];
   if (child->is_folder()) {
     NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
     [menu setSubmenu:submenu forItem:item];
@@ -1138,7 +1244,7 @@
 
   CGFloat maxViewX = NSMaxX([[self view] bounds]);
   int xOffset =
-      bookmarks::kBookmarkLeftMargin - bookmarks::kBookmarkHorizontalPadding;
+      bookmarks::BookmarkLeftMargin() - bookmarks::BookmarkHorizontalPadding();
 
   // Draw the apps bookmark if needed.
   if (![appsPageShortcutButton_ isHidden]) {
@@ -1150,7 +1256,7 @@
 
   // Draw the managed bookmark folder if needed.
   if (![managedBookmarksButton_ isHidden]) {
-    xOffset += bookmarks::kBookmarkHorizontalPadding;
+    xOffset += bookmarks::BookmarkHorizontalPadding();
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[managedBookmarksButton_ cell]
                                      xOffset:&xOffset];
@@ -1159,7 +1265,7 @@
 
   // Draw the supervised bookmark folder if needed.
   if (![supervisedBookmarksButton_ isHidden]) {
-    xOffset += bookmarks::kBookmarkHorizontalPadding;
+    xOffset += bookmarks::BookmarkHorizontalPadding();
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[supervisedBookmarksButton_ cell]
                                      xOffset:&xOffset];
@@ -1236,7 +1342,7 @@
   NSMutableArray* buttons = [self buttons];
   for (NSButton* button in buttons) {
     if (NSMaxX([button frame]) > (NSMinX([offTheSideButton_ frame]) -
-                                  bookmarks::kBookmarkHorizontalPadding))
+                                  bookmarks::BookmarkHorizontalPadding()))
       break;
     [buttonView_ addSubview:button];
     ++displayedButtonCount_;
@@ -1620,25 +1726,25 @@
 // 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::kBookmarkLeftMargin;
+  CGFloat left = bookmarks::BookmarkLeftMargin();
   NSRect buttonFrame = NSZeroRect;
 
   // Draw the apps bookmark if needed.
   if (![appsPageShortcutButton_ isHidden]) {
     left = NSMaxX([appsPageShortcutButton_ frame]) +
-        bookmarks::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   }
 
   // Draw the managed bookmarks folder if needed.
   if (![managedBookmarksButton_ isHidden]) {
     left = NSMaxX([managedBookmarksButton_ frame]) +
-        bookmarks::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   }
 
   // Draw the supervised bookmarks folder if needed.
   if (![supervisedBookmarksButton_ isHidden]) {
     left = NSMaxX([supervisedBookmarksButton_ frame]) +
-        bookmarks::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   }
 
   for (NSButton* button in buttons_.get()) {
@@ -1647,7 +1753,7 @@
       continue;
     buttonFrame = [button frame];
     buttonFrame.origin.x = left;
-    left += buttonFrame.size.width + bookmarks::kBookmarkHorizontalPadding;
+    left += buttonFrame.size.width + bookmarks::BookmarkHorizontalPadding();
     if (button == wantedButton)
       return buttonFrame;
   }
@@ -1666,14 +1772,14 @@
   // If necessary, pull in the width to account for the Other Bookmarks button.
   if ([self setOtherBookmarksButtonVisibility]) {
     maxViewX = [otherBookmarksButton_ frame].origin.x -
-        bookmarks::kBookmarkRightMargin;
+        bookmarks::BookmarkRightMargin();
   }
 
   [self positionRightSideButtons];
   // If we're already overflowing, then we need to account for the chevron.
   if (visible) {
     maxViewX =
-        [offTheSideButton_ frame].origin.x - bookmarks::kBookmarkRightMargin;
+        [offTheSideButton_ frame].origin.x - bookmarks::BookmarkRightMargin();
   }
 
   return maxViewX;
@@ -1711,20 +1817,27 @@
   // for more buttons.
   int xOffset;
   if (displayedButtonCount_ > 0) {
-    xOffset = NSMaxX([self finalRectOfLastButton]) +
-        bookmarks::kBookmarkHorizontalPadding;
+    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::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   } else if (![supervisedBookmarksButton_ isHidden]) {
     xOffset = NSMaxX([supervisedBookmarksButton_ frame]) +
-        bookmarks::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   } else if (![appsPageShortcutButton_ isHidden]) {
     xOffset = NSMaxX([appsPageShortcutButton_ frame]) +
-        bookmarks::kBookmarkHorizontalPadding;
+        bookmarks::BookmarkHorizontalPadding();
   } else {
-    xOffset = bookmarks::kBookmarkLeftMargin -
-        bookmarks::kBookmarkHorizontalPadding;
+    xOffset = bookmarks::BookmarkLeftMargin() -
+        bookmarks::BookmarkHorizontalPadding();
   }
   for (int i = displayedButtonCount_; i < barCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
@@ -1758,10 +1871,6 @@
   return buttons_.get();
 }
 
-- (NSButton*)offTheSideButton {
-  return offTheSideButton_;
-}
-
 - (NSButton*)appsPageShortcutButton {
   return appsPageShortcutButton_;
 }
@@ -1813,13 +1922,19 @@
 // Return an autoreleased NSCell suitable for a bookmark button.
 // TODO(jrg): move much of the cell config into the BookmarkButtonCell class.
 - (BookmarkButtonCell*)cellForBookmarkNode:(const BookmarkNode*)node {
-  NSImage* image = node ? [self faviconForNode:node] : nil;
+  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_];
-  [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+  } else {
+    [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
+  }
 
   // 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.
@@ -1836,7 +1951,11 @@
       [BookmarkButtonCell buttonCellWithText:text
                                        image:image
                               menuController:contextMenuController_];
-  [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+  } else {
+    [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
+  }
 
   // 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.
@@ -1852,11 +1971,15 @@
                                  xOffset:(int*)xOffset {
   DCHECK(xOffset);
   NSRect bounds = [buttonView_ bounds];
-  bounds.size.height = bookmarks::kBookmarkButtonHeight;
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    bounds.size.height = bookmarks::kMaterialBookmarkButtonHeight;
+  } else {
+    bounds.size.height = bookmarks::kBookmarkButtonHeight;
+  }
 
   NSRect frame = NSInsetRect(bounds,
-                             bookmarks::kBookmarkHorizontalPadding,
-                             bookmarks::kBookmarkVerticalPadding);
+                             bookmarks::BookmarkHorizontalPadding(),
+                             bookmarks::BookmarkVerticalPadding());
   frame.size.width = [self widthForBookmarkButtonCell:cell];
 
   // Add an X offset based on what we've already done
@@ -2159,15 +2282,15 @@
     CGFloat left;
     if (![supervisedBookmarksButton_ isHidden]) {
       left = NSMaxX([supervisedBookmarksButton_ frame]) +
-             bookmarks::kBookmarkHorizontalPadding;
+             bookmarks::BookmarkHorizontalPadding();
     } else if (![managedBookmarksButton_ isHidden]) {
       left = NSMaxX([managedBookmarksButton_ frame]) +
-             bookmarks::kBookmarkHorizontalPadding;
+             bookmarks::BookmarkHorizontalPadding();
     } else if (![appsPageShortcutButton_ isHidden]) {
       left = NSMaxX([appsPageShortcutButton_ frame]) +
-             bookmarks::kBookmarkHorizontalPadding;
+             bookmarks::BookmarkHorizontalPadding();
     } else {
-      left = bookmarks::kBookmarkLeftMargin;
+      left = bookmarks::BookmarkLeftMargin();
     }
     CGFloat paddingWidth = bookmarks::kDefaultBookmarkWidth;
     BookmarkButton* draggedButton = [BookmarkButton draggedButton];
@@ -2190,7 +2313,7 @@
       left += buttonFrame.size.width;
       if (left > insertionPos_)
         buttonFrame.origin.x += paddingWidth;
-      left += bookmarks::kBookmarkHorizontalPadding;
+      left += bookmarks::BookmarkHorizontalPadding();
       if (innerContentAnimationsEnabled_)
         [[button animator] setFrame:buttonFrame];
       else
@@ -2206,15 +2329,15 @@
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate {
 
   // Position the apps bookmark if needed.
-  CGFloat left = bookmarks::kBookmarkLeftMargin;
+  CGFloat left = bookmarks::BookmarkLeftMargin();
   if (![appsPageShortcutButton_ isHidden]) {
-    int xOffset =
-        bookmarks::kBookmarkLeftMargin - bookmarks::kBookmarkHorizontalPadding;
+    int xOffset = bookmarks::BookmarkLeftMargin() -
+            bookmarks::BookmarkHorizontalPadding();
     NSRect frame =
         [self frameForBookmarkButtonFromCell:[appsPageShortcutButton_ cell]
                                      xOffset:&xOffset];
     [appsPageShortcutButton_ setFrame:frame];
-    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
+    left = xOffset + bookmarks::BookmarkHorizontalPadding();
   }
 
   // Position the managed bookmarks folder if needed.
@@ -2224,7 +2347,7 @@
         [self frameForBookmarkButtonFromCell:[managedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [managedBookmarksButton_ setFrame:frame];
-    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
+    left = xOffset + bookmarks::BookmarkHorizontalPadding();
   }
 
   // Position the supervised bookmarks folder if needed.
@@ -2234,7 +2357,7 @@
         [self frameForBookmarkButtonFromCell:[supervisedBookmarksButton_ cell]
                                      xOffset:&xOffset];
     [supervisedBookmarksButton_ setFrame:frame];
-    left = xOffset + bookmarks::kBookmarkHorizontalPadding;
+    left = xOffset + bookmarks::BookmarkHorizontalPadding();
   }
 
   animate &= innerContentAnimationsEnabled_;
@@ -2245,7 +2368,7 @@
       continue;
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.x = left;
-    left += buttonFrame.size.width + bookmarks::kBookmarkHorizontalPadding;
+    left += buttonFrame.size.width + bookmarks::BookmarkHorizontalPadding();
     if (animate)
       [[button animator] setFrame:buttonFrame];
     else
@@ -2374,8 +2497,10 @@
   for (BookmarkButton* button in buttons_.get()) {
     const BookmarkNode* cellnode = [button bookmarkNode];
     if (cellnode == node) {
+      BOOL darkTheme = [[[self view] window] hasDarkTheme];
+      NSImage* theImage = [self faviconForNode:node forADarkTheme:darkTheme];
       [[button cell] setBookmarkCellText:[button title]
-                                   image:[self faviconForNode:node]];
+                                   image:theImage];
       // Adding an image means we might need more room for the
       // bookmark.  Test for it by growing the button (if needed)
       // and shifting everything else over.
@@ -2538,7 +2663,16 @@
 // 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];
+  }
   [folderController_ close];
+  [[parentButton cell] setHighlighted:NO];
+  [parentButton setNeedsDisplay:YES];
   folderController_ = nil;
 }
 
@@ -2681,7 +2815,7 @@
 // Return the x position for a drop indicator.
 - (CGFloat)indicatorPosForDragToPoint:(NSPoint)point {
   CGFloat x = 0;
-  CGFloat halfHorizontalPadding = 0.5 * bookmarks::kBookmarkHorizontalPadding;
+  CGFloat halfHorizontalPadding = 0.5 * bookmarks::BookmarkHorizontalPadding();
   int destIndex = [self indexForDragToPoint:point];
   int numButtons = displayedButtonCount_;
 
@@ -2694,7 +2828,7 @@
   } else if (![appsPageShortcutButton_ isHidden]) {
     leftmostX = NSMaxX([appsPageShortcutButton_ frame]) + halfHorizontalPadding;
   } else {
-    leftmostX = bookmarks::kBookmarkLeftMargin - halfHorizontalPadding;
+    leftmostX = bookmarks::BookmarkLeftMargin() - halfHorizontalPadding;
   }
 
   // If it's a drop strictly between existing buttons ...
@@ -2797,7 +2931,7 @@
 - (void)addButtonForNode:(const BookmarkNode*)node
                  atIndex:(NSInteger)buttonIndex {
   int newOffset =
-      bookmarks::kBookmarkLeftMargin - bookmarks::kBookmarkHorizontalPadding;
+      bookmarks::BookmarkLeftMargin() - bookmarks::BookmarkHorizontalPadding();
   if (buttonIndex == -1)
     buttonIndex = [buttons_ count];  // New button goes at the end.
   if (buttonIndex <= (NSInteger)[buttons_ count]) {
@@ -2805,7 +2939,7 @@
       BookmarkButton* targetButton = [buttons_ objectAtIndex:buttonIndex - 1];
       NSRect targetFrame = [targetButton frame];
       newOffset = targetFrame.origin.x + NSWidth(targetFrame) +
-          bookmarks::kBookmarkHorizontalPadding;
+          bookmarks::BookmarkHorizontalPadding();
     }
     BookmarkButton* newButton = [self buttonForNode:node xOffset:&newOffset];
     ++displayedButtonCount_;