cocoa browser: remove non-MD bookmark bar support

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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_folder_controller.h"
 
 #include <stddef.h>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 106 matching lines @@
     deltaScrollerY(0.0),
     minimumY(0.0),
     screenBottomY(0.0),
     oldWindowY(0.0),
     folderY(0.0),
     folderTop(0.0) {}
 };
 
 NSRect GetFirstButtonFrameForHeight(CGFloat height) {
   CGFloat y = height - bookmarks::kBookmarkFolderButtonHeight -
-      bookmarks::BookmarkTopVerticalPadding();
+      bookmarks::kBookmarkTopVerticalPadding;
   return NSMakeRect(0, y, bookmarks::kDefaultBookmarkWidth,
                     bookmarks::kBookmarkFolderButtonHeight);
 }
 
 }  // namespace
 
-namespace bookmarks {
-
-CGFloat BookmarkTopVerticalPadding() {
-  return bookmarks::BookmarkVerticalPadding();
-}
-
-CGFloat BookmarkBottomVerticalPadding() {
-  return ui::MaterialDesignController::IsModeMaterial()
-      ? 0 : bookmarks::BookmarkVerticalPadding();
-}
-
-}  // bookmarks
-
 
 // Required to set the right tracking bounds for our fake menus.
 @interface NSView(Private)
 - (void)_updateTrackingAreas;
 @end
 
 @interface BookmarkBarFolderController ()
 - (void)configureWindow;
 - (void)addOrUpdateScrollTracking;
 - (void)removeScrollTracking;
@@ skipping 167 matching lines @@
   // Note: we don't need to
   //   [NSObject cancelPreviousPerformRequestsWithTarget:self];
   // Because all of our performSelector: calls use withDelay: which
   // retains us.
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   NSRect windowFrame = [[self window] frame];
   NSRect scrollViewFrame = [scrollView_ frame];
-  padding_ = NSWidth(windowFrame) - NSWidth(scrollViewFrame);
-  // In Material Design, each menu row spans the entire width of the menu.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    scrollViewFrame.size.width += padding_;
-    scrollViewFrame.origin.x = 0;
-    // If we leave the scrollview's vertical position and height as is, it will
-    // cover the menu's rounded corners and we'll get a rectangular menu.
-    scrollViewFrame.origin.y += bookmarks::BookmarkVerticalPadding();
-    scrollViewFrame.size.height -= 2 * bookmarks::BookmarkVerticalPadding();
-    [scrollView_ setFrame:scrollViewFrame];
-    padding_ = 0;
-  }
+  // Each menu row spans the entire width of the menu.
+  scrollViewFrame.size.width += NSWidth(windowFrame) - NSWidth(scrollViewFrame);
+  scrollViewFrame.origin.x = 0;
+  // If we leave the scrollview's vertical position and height as is, it will
+  // cover the menu's rounded corners and we'll get a rectangular menu.
+  scrollViewFrame.origin.y += bookmarks::kBookmarkVerticalPadding;
+  scrollViewFrame.size.height -= 2 * bookmarks::kBookmarkVerticalPadding;
+  [scrollView_ setFrame:scrollViewFrame];
+  padding_ = 0;
   verticalScrollArrowHeight_ = NSHeight([scrollUpArrowView_ frame]);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   NSImage* image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_DOWN).ToNSImage();
   [[scrollUpArrowView_.subviews objectAtIndex:0] setImage:image];
 
   image = rb.GetNativeImageNamed(IDR_MENU_OVERFLOW_UP).ToNSImage();
   [[scrollDownArrowView_.subviews objectAtIndex:0] setImage:image];
 }
 
@@ skipping 37 matching lines @@
   NSImage* image = child ? [barController_ faviconForNode:child
                                             forADarkTheme:NO]
                          : nil;
   BookmarkContextMenuCocoaController* menuController =
       [barController_ menuController];
   BookmarkBarFolderButtonCell* cell =
       [BookmarkBarFolderButtonCell buttonCellForNode:child
                                                 text:nil
                                                image:image
                                       menuController:menuController];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    [cell setTag:kMaterialMenuButtonTypeWithLimitedClickFeedback];
-  } else {
-    [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
-  }
+  [cell setTag:kMaterialMenuButtonTypeWithLimitedClickFeedback];
   return cell;
 }
 
 // Redirect to our logic shared with BookmarkBarController.
 - (IBAction)openBookmarkFolderFromButton:(id)sender {
   [folderTarget_ openBookmarkFolderFromButton:sender];
 }
 
 // Create a bookmark button for the given node using frame.
 //
@@ skipping 28 matching lines @@
   // limited by the abolute minimum and maximum allowable widths.
   frame.size.width =
       std::min(std::max(bookmarks::kBookmarkMenuButtonMinimumWidth,
                         std::max(frame.size.width, desired)),
                bookmarks::kBookmarkMenuButtonMaximumWidth);
 
   BookmarkButton* button = [[[BookmarkButton alloc] initWithFrame:frame]
                                autorelease];
   DCHECK(button);
 
-  // Folder menu buttons have a flat background color in Material Design.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    [button setBackgroundColor:
-        [BookmarkBarFolderWindowContentView backgroundColor]];
-  }
+  // Folder menu buttons have a flat background color.
+  [button setBackgroundColor:
+      [BookmarkBarFolderWindowContentView backgroundColor]];
   [button setCell:cell];
   [button setDelegate:self];
   if (node) {
     if (node->is_folder()) {
       [button setTarget:self];
       [button setAction:@selector(openBookmarkFolderFromButton:)];
     } else {
       // Make the button do something.
       [button setTarget:barController_];
       [button setAction:@selector(openBookmark:)];
@@ skipping 75 matching lines @@
     // is bottom of button's parent view.
     NSPoint buttonBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [parentButton_ convertPoint:NSZeroPoint toView:nil]);
     NSPoint bookmarkBarBottomLeftInScreen = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [[parentButton_ superview] convertPoint:NSZeroPoint toView:nil]);
     newWindowTopLeft = NSMakePoint(
         buttonBottomLeftInScreen.x,
         bookmarkBarBottomLeftInScreen.y + bookmarks::kBookmarkBarMenuOffset);
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      newWindowTopLeft.y += bookmarks::kBookmarkBarButtonOffset;
-    }
     // Make sure the window is on-screen; if not, push left or right. It is
     // intentional that top level folders "push left" or "push right" slightly
     // different than subfolders.
     NSRect screenVisibleFrame = [[self menuScreen] visibleFrame];
     // Test if window goes off-screen on the right side.
     CGFloat spillOff =
         newWindowTopLeft.x + windowWidth - NSMaxX(screenVisibleFrame);
     if (spillOff > 0.0) {
       newWindowTopLeft.x = std::max(newWindowTopLeft.x - spillOff,
                                     NSMinX(screenVisibleFrame));
@@ skipping 10 matching lines @@
         (windowHeight > availableVerticalSpace)) {
       newWindowTopLeft.y = std::min(
           newWindowTopLeft.y + windowHeight + NSHeight([parentButton_ frame]),
           NSMaxY(screenVisibleFrame));
     }
   } else {
     // Parent is a folder: expose as much as we can vertically; grow right/left.
     newWindowTopLeft.x = [self childFolderWindowLeftForWidth:windowWidth];
     NSPoint topOfWindow =
         NSMakePoint(0, NSMaxY([parentButton_ frame]) +
-            bookmarks::BookmarkTopVerticalPadding());
+            bookmarks::kBookmarkTopVerticalPadding);
     topOfWindow = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [[parentButton_ superview] convertPoint:topOfWindow toView:nil]);
     newWindowTopLeft.y = topOfWindow.y;
   }
   return newWindowTopLeft;
 }
 
 // Set our window level to the right spot so we're above the menubar, dock, etc.
 // Factored out so we can override/noop in a unit test.
 - (void)configureWindowLevel {
   [[self window] setLevel:NSPopUpMenuWindowLevel];
 }
 
 - (int)menuHeightForButtonCount:(int)buttonCount {
   // This does not take into account any padding which may be required at the
   // top and/or bottom of the window.
   return (buttonCount * bookmarks::kBookmarkFolderButtonHeight) +
-      bookmarks::BookmarkTopVerticalPadding() +
-      bookmarks::BookmarkBottomVerticalPadding();
+      bookmarks::kBookmarkTopVerticalPadding +
+      bookmarks::kBookmarkBottomVerticalPadding;
 }
 
 - (void)adjustWindowLeft:(CGFloat)windowLeft
                     size:(NSSize)windowSize
              scrollingBy:(CGFloat)scrollDelta {
   // Callers of this function should make adjustments to the vertical
   // attributes of the folder view only (height, scroll position).
   // This function will then make appropriate layout adjustments in order
   // to accommodate screen/dock margins, scroll-up and scroll-down arrow
   // presentation, etc.
@@ skipping 262 matching lines @@
                                   windowWidth, height);
   [window setFrame:windowFrame display:NO];
 
   NSRect folderFrame = NSMakeRect(0, 0, windowWidth, height);
   // Each menu button is 24pt tall but its highlight is only 20pt - effectively
   // each menu button includes 4pts of vertical padding. This wasn't a problem
   // pre-Material, but now that the |scrollView_| is shorter we have an extra
   // 4pt of padding pushing the topmost item beyond the top of the
   // |scrollView_|. Scoot the |folderView_| down by this padding to avoid
   // clipping the topmost item.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    folderFrame.origin.y -= bookmarks::BookmarkVerticalPadding();
-  }
+  folderFrame.origin.y -= bookmarks::kBookmarkVerticalPadding;
   [folderView_ setFrame:folderFrame];
 
   // For some reason, when opening a "large" bookmark folder (containing 12 or
   // more items) using the keyboard, the scroll view seems to want to be
   // offset by default: [ http://crbug.com/101099 ].  Explicitly reseting the
   // scroll position here is a bit hacky, but it does seem to work.
   [[scrollView_ contentView] scrollToPoint:NSZeroPoint];
 
   NSSize newSize = NSMakeSize(windowWidth, 0.0);
   [self adjustWindowLeft:newWindowTopLeft.x size:newSize scrollingBy:0.0];
@@ skipping 884 matching lines @@
   int destIndex = [self indexForDragToPoint:point];
   int numButtons = static_cast<int>([buttons_ count]);
 
   // If it's a drop strictly between existing buttons or at the very beginning
   if (destIndex >= 0 && destIndex < numButtons) {
     // ... put the indicator right between the buttons.
     BookmarkButton* button =
         [buttons_ objectAtIndex:static_cast<NSUInteger>(destIndex)];
     DCHECK(button);
     NSRect buttonFrame = [button frame];
-    y = NSMaxY(buttonFrame) + 0.5 * bookmarks::BookmarkTopVerticalPadding();
+    y = NSMaxY(buttonFrame) + 0.5 * bookmarks::kBookmarkTopVerticalPadding;
 
     // If it's a drop at the end (past the last button, if there are any) ...
   } else if (destIndex == numButtons) {
     // and if it's past the last button ...
     if (numButtons > 0) {
       // ... find the last button, and put the indicator below it.
       BookmarkButton* button =
           [buttons_ objectAtIndex:static_cast<NSUInteger>(destIndex - 1)];
       DCHECK(button);
       NSRect buttonFrame = [button frame];
       y = buttonFrame.origin.y -
-          0.5 * bookmarks::BookmarkBottomVerticalPadding();
+          0.5 * bookmarks::kBookmarkBottomVerticalPadding;
 
     }
   } else {
     NOTREACHED();
   }
 
   return y;
 }
 
 - (Profile*)profile {
@@ skipping 295 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController