cocoa browser: remove non-MD bookmark bar support

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

 // Copyright (c) 2011 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_button_cell.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h"
 #include "chrome/grit/generated_resources.h"
 #import "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.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/resources/grit/ui_resources.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 // Padding on the right side of the arrow icon.
 const int kHierarchyButtonRightPadding = 4;
 
 // Padding on the left side of the arrow icon.
-int HierarchyButtonLeftPadding() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 11 : 2;
-}
+const int kHierarchyButtonLeftPadding = 11;
 
 const int kIconTextSpacer = 4;
 const int kTextRightPadding = 4;
 const int kIconLeftPadding = 4;
 
 const int kDefaultFontSize = 12;
 
 };  // namespace
 
 @interface OffTheSideButtonCell : BookmarkButtonCell
 
 - (NSString*)accessibilityTitle;
 
 @end
 @implementation OffTheSideButtonCell
 
 - (BOOL)isOffTheSideButtonCell {
   return YES;
 }
 
 - (NSString*)accessibilityTitle {
   return l10n_util::GetNSString(IDS_ACCNAME_BOOKMARKS_CHEVRON);
 }
 
 - (NSRect)imageRectForBounds:(NSRect)theRect {
   NSRect imageRect = [super imageRectForBounds:theRect];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // Make sure the chevron icon stays centered. Normally a bookmark bar item
-    // with no label has its icon placed at a fixed x-position.
-    CGFloat totalWidth = NSMaxX(theRect);
-    imageRect.origin.x = (totalWidth - [self image].size.width) / 2;
-  }
+  // Make sure the chevron icon stays centered. Normally a bookmark bar item
+  // with no label has its icon placed at a fixed x-position.
+  CGFloat totalWidth = NSMaxX(theRect);
+  imageRect.origin.x = (totalWidth - [self image].size.width) / 2;
   return imageRect;
 }
 
 @end
 
 @interface BookmarkButtonCell(Private)
 // Returns YES if the cell is the offTheSide button cell.
 - (BOOL)isOffTheSideButtonCell;
 - (void)configureBookmarkButtonCell;
 - (void)applyTextColor;
@@ skipping 101 matching lines @@
 - (BOOL)isOffTheSideButtonCell {
   return NO;
 }
 
 // Perform all normal init routines specific to the BookmarkButtonCell.
 - (void)configureBookmarkButtonCell {
   [self setButtonType:NSMomentaryPushInButton];
   [self setShowsBorderOnlyWhileMouseInside:YES];
   [self setControlSize:NSSmallControlSize];
   [self setAlignment:NSLeftTextAlignment];
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-    [self setBezelStyle:NSShadowlessSquareBezelStyle];
-  } else {
-    [self setFont:[NSFont systemFontOfSize:kDefaultFontSize]];
-    [self setBordered:NO];
-    [self setBezeled:NO];
-  }
+  [self setFont:[NSFont systemFontOfSize:kDefaultFontSize]];
+  [self setBordered:NO];
+  [self setBezeled:NO];
   [self setWraps:NO];
   // NSLineBreakByTruncatingMiddle seems more common on OSX but let's
   // try to match Windows for a bit to see what happens.
   [self setLineBreakMode:NSLineBreakByTruncatingTail];
 
   // The overflow button chevron bitmap is not 16 units high, so it'd be scaled
   // at paint time without this.
   [self setImageScaling:NSImageScaleNone];
 
   // Theming doesn't work for bookmark buttons yet (cell text is chucked).
   [super setShouldTheme:NO];
 }
 
 - (BOOL)empty {
   return empty_;
 }
 
 - (void)setEmpty:(BOOL)empty {
   empty_ = empty;
   [self setShowsBorderOnlyWhileMouseInside:!empty];
 }
 
 - (NSSize)cellSizeForBounds:(NSRect)aRect {
-  // There's no bezel or border in Material Design so return cellSize.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    NSSize size = [self cellSize];
-    size.width = std::min(aRect.size.width, size.width);
-    size.height = std::min(aRect.size.height, size.height);
-    return size;
-  }
-  NSSize size = [super cellSizeForBounds:aRect];
-  // Cocoa seems to slightly underestimate how much space we need, so we
-  // compensate here to avoid a clipped rendering.
-  size.width += 2;
-  size.height += 4;
+  // There's no bezel or border so return cellSize.
+  NSSize size = [self cellSize];
+  size.width = std::min(aRect.size.width, size.width);
+  size.height = std::min(aRect.size.height, size.height);
   return size;
 }
 
 - (void)setBookmarkCellText:(NSString*)title
                       image:(NSImage*)image {
   title = [title stringByReplacingOccurrencesOfString:@"\n"
                                            withString:@" "];
   title = [title stringByReplacingOccurrencesOfString:@"\r"
                                            withString:@" "];
 
@@ skipping 112 matching lines @@
 }
 
 - (NSString*)visibleTitle {
   return [self imagePosition] != NSImageOnly ? [self title] : @"";
 }
 
 // Add extra size for the arrow so it doesn't overlap the text.
 // Does not sanity check to be sure this is actually a folder node.
 - (NSSize)cellSize {
   NSSize cellSize = NSZeroSize;
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    cellSize = [super cellSize];
+  // Return the space needed to display the image and title, with a little
+  // distance between them.
+  cellSize = NSMakeSize(kIconLeftPadding + [[self image] size].width,
+                        bookmarks::kBookmarkButtonHeight);
+  NSString* title = [self visibleTitle];
+  if ([title length] > 0) {
+    CGFloat textWidth =
+        [title sizeWithAttributes:[self titleTextAttributes]].width;
+    cellSize.width +=
+        kIconTextSpacer + std::ceil(textWidth) + kTextRightPadding;
   } else {
-    // Return the space needed to display the image and title, with a little
-    // distance between them.
-    cellSize = NSMakeSize(kIconLeftPadding + [[self image] size].width,
-                          bookmarks::kBookmarkButtonHeight);
-    NSString* title = [self visibleTitle];
-    if ([title length] > 0) {
-      CGFloat textWidth =
-          [title sizeWithAttributes:[self titleTextAttributes]].width;
-      cellSize.width +=
-          kIconTextSpacer + std::ceil(textWidth) + kTextRightPadding;
-    } else {
-      // Make buttons without visible titles 20pts wide (18 plus padding).
-      cellSize.width += kIconLeftPadding;
-    }
+    // Make buttons without visible titles 20pts wide (18 plus padding).
+    cellSize.width += kIconLeftPadding;
   }
 
   if (drawFolderArrow_) {
     cellSize.width += [arrowImage_ size].width +
-                      HierarchyButtonLeftPadding() +
+                      kHierarchyButtonLeftPadding +
                       kHierarchyButtonRightPadding;
   }
   return cellSize;
 }
 
 - (NSRect)imageRectForBounds:(NSRect)theRect {
   NSRect imageRect = [super imageRectForBounds:theRect];
-  // In Material Design, add a little space between the image and the button's
-  // left edge, but only if there's a visible title.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    imageRect.origin.y -= 1;
-    imageRect.origin.x = kIconLeftPadding;
-  }
+  // Add a little space between the image and the button's left edge, but only
+  // if there's a visible title.
+  imageRect.origin.y -= 1;
+  imageRect.origin.x = kIconLeftPadding;
   return imageRect;
 }
 
 - (CGFloat)textStartXOffset {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return [super textStartXOffset];
-  }
   return kIconLeftPadding + [[self image] size].width + kIconTextSpacer;
 }
 
 - (void)drawFocusRingMaskWithFrame:(NSRect)cellFrame
                             inView:(NSView*)controlView {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // In Material Design we have to adjust the focus ring slightly for the
-    // chevron and regular bookmark icons.
-    if ([self isOffTheSideButtonCell]) {
-      cellFrame.origin.y -= 2;
-    } else if ([self visibleTitle].length > 0) {
-      cellFrame.origin.x += 4;
-    }
-    if ([controlView cr_lineWidth] < 1) {
-      cellFrame.origin.y -= 0.5;
-    }
+  // We have to adjust the focus ring slightly for the chevron and regular
+  // bookmark icons.
+  if ([self isOffTheSideButtonCell]) {
+    cellFrame.origin.y -= 2;
+  } else if ([self visibleTitle].length > 0) {
+    cellFrame.origin.x += 4;
+  }
+  if ([controlView cr_lineWidth] < 1) {
+    cellFrame.origin.y -= 0.5;
   }
   [super drawFocusRingMaskWithFrame:cellFrame inView:controlView];
 }
 
 // Override cell drawing to add a submenu arrow like a real menu.
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // First draw "everything else".
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 
   // If asked to do so, and if a folder, draw the arrow.
@@ skipping 13 matching lines @@
     [arrowImage_ drawInRect:drawRect
                     fromRect:imageRect
                    operation:NSCompositeSourceOver
                     fraction:[self isEnabled] ? 1.0 : 0.5
               respectFlipped:YES
                        hints:nil];
   }
 }
 
 - (int)verticalTextOffset {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return 0;
-  }
   return -1;
 }
 
 - (CGFloat)hoverBackgroundVerticalOffsetInControlView:(NSView*)controlView {
   // In Material Design on Retina, and not in a folder menu, nudge the hover
   // background by 1px.
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   if ([self isMaterialDesignButtonType] && ![self isFolderButtonCell] &&
       kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end