Revert of [Mac][Material Design] Bring bookmark hover state, etc. up to spec.

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::BookmarkVerticalPadding();
   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 401 matching lines @@
         (NSMinY(screenVisibleFrame) + bookmarks::kScrollWindowVerticalMargin);
     if ((availableVerticalSpace < kMinSqueezedMenuHeight) &&
         (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());
+    NSPoint topOfWindow = NSMakePoint(0,
+                                      NSMaxY([parentButton_ frame]) -
+                                          bookmarks::BookmarkVerticalPadding());
     topOfWindow = ui::ConvertPointFromWindowToScreen(
         [parentButton_ window],
         [[parentButton_ superview] convertPoint:topOfWindow toView:nil]);
     newWindowTopLeft.y = topOfWindow.y +
-                         bookmarks::BookmarkTopVerticalPadding() +
-                         bookmarks::BookmarkBottomVerticalPadding();
+                         2 * bookmarks::BookmarkVerticalPadding();
   }
   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();
+      2 * bookmarks::BookmarkVerticalPadding();
 }
 
 - (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 1151 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::BookmarkVerticalPadding();
 
     // 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();
+      y = buttonFrame.origin.y - 0.5 * bookmarks::BookmarkVerticalPadding();
 
     }
   } else {
     NOTREACHED();
   }
 
   return y;
 }
 
 - (Profile*)profile {
@@ skipping 295 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController