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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
@@ skipping 30 matching lines @@
 class BookmarkNode;
 class ManagedBookmarkService;
 
 // Magic numbers from Cole
 // TODO(jrg): create an objc-friendly version of bookmark_bar_constants.h?
 
 // Used as a maximum width for buttons on the bar.
 const CGFloat kDefaultBookmarkWidth = 150.0;
 
 // Horizontal frame inset for buttons in the bookmark bar.
-CGFloat BookmarkHorizontalPadding();
+const CGFloat kBookmarkHorizontalPadding = 1.0;
 
 // Vertical frame inset for buttons in the bookmark bar.
-CGFloat BookmarkVerticalPadding();
+const CGFloat kBookmarkVerticalPadding = 2.0;
 
 // Left margin before the first button in the bookmark bar.
-CGFloat BookmarkLeftMargin();
+const CGFloat kBookmarkLeftMargin = 2.0;
 
 // Right margin before the last button in the bookmark bar.
-CGFloat BookmarkRightMargin();
+const CGFloat kBookmarkRightMargin = 2.0;
 
 // Used as a min/max width for buttons on menus (not on the bar).
 const CGFloat kBookmarkMenuButtonMinimumWidth = 100.0;
 const CGFloat kBookmarkMenuButtonMaximumWidth = 485.0;
 
 // The minimum separation between a folder menu and the edge of the screen.
 // If the menu gets closer to the edge of the screen (either right or left)
 // then it is pops up in the opposite direction.
 // (See -[BookmarkBarFolderController childFolderWindowLeftForWidth:]).
 const CGFloat kBookmarkHorizontalScreenPadding = 8.0;
@@ skipping 118 matching lines @@
   // node from the item.  When adding items in, we start with seedId_.
   int32_t seedId_;
   std::map<int32_t, int64_t> menuTagMap_;
 
   // Our bookmark buttons, ordered from L-->R.
   base::scoped_nsobject<NSMutableArray> buttons_;
 
   // The folder image so we can use one copy for all buttons
   base::scoped_nsobject<NSImage> folderImage_;
 
-  // The Material Design Incognito folder image so we can use one copy for all
-  // buttons
-  base::scoped_nsobject<NSImage> folderImageWhite_;
-
   // The default image, so we can use one copy for all buttons.
   base::scoped_nsobject<NSImage> defaultImage_;
 
   // If the bar is disabled, we hide it and ignore show/hide commands.
   // Set when using fullscreen mode.
   BOOL barIsEnabled_;
 
   // Bridge from Chrome-style C++ notifications (e.g. derived from
   // BookmarkModelObserver)
   std::unique_ptr<BookmarkBarBridge> bridge_;
@@ skipping 147 matching lines @@
 - (CGFloat)toolbarDividerOpacity;
 
 // Updates the sizes and positions of the subviews.
 // TODO(viettrungluu): I'm not convinced this should be public, but I currently
 // need it for animations. Try not to propagate its use.
 - (void)layoutSubviews;
 
 // Called by our view when it is moved to a window.
 - (void)viewDidMoveToWindow;
 
-// Provide a favicon for a bookmark node, specifying whether or not it's for
-// use with a dark window theme.  May return nil.
-- (NSImage*)faviconForNode:(const bookmarks::BookmarkNode*)node
-             forADarkTheme:(BOOL)forADarkTheme;
+// Provide a favicon for a bookmark node.  May return nil.
+- (NSImage*)faviconForNode:(const bookmarks::BookmarkNode*)node;
 
 // Used for situations where the bookmark bar folder menus should no longer
 // be actively popping up. Called when the window loses focus, a click has
 // occured outside the menus or a bookmark has been activated. (Note that this
 // differs from the behavior of the -[BookmarkButtonControllerProtocol
 // closeAllBookmarkFolders] method in that the latter does not terminate menu
 // tracking since it may be being called in response to actions (such as
 // dragging) where a 'stale' menu presentation should first be collapsed before
 // presenting a new menu.)
 - (void)closeFolderAndStopTrackingMenus;
 
 // Checks if operations such as edit or delete are allowed.
 - (BOOL)canEditBookmark:(const bookmarks::BookmarkNode*)node;
 
 // Checks if bookmark editing is enabled at all.
 - (BOOL)canEditBookmarks;
 
 // Actions for manipulating bookmarks.
 // Open a normal bookmark or folder from a button, ...
 - (IBAction)openBookmark:(id)sender;
 - (IBAction)openBookmarkFolderFromButton:(id)sender;
 // From the "off the side" button, ...
 - (IBAction)openOffTheSideFolderFromButton:(id)sender;
 // Import bookmarks from another browser.
 - (IBAction)importBookmarks:(id)sender;
-
-// Returns the "off the side" button (aka the chevron button).
-- (NSButton*)offTheSideButton;
-
-// Returns the "off the side" button image.
-- (NSImage*)offTheSideButtonImage:(BOOL)forDarkMode;
-
 @end
 
 // Redirects from BookmarkBarBridge, the C++ object which glues us to
 // the rest of Chromium.  Internal to BookmarkBarController.
 @interface BookmarkBarController(BridgeRedirect)
 - (void)loaded:(bookmarks::BookmarkModel*)model;
 - (void)beingDeleted:(bookmarks::BookmarkModel*)model;
 - (void)nodeAdded:(bookmarks::BookmarkModel*)model
            parent:(const bookmarks::BookmarkNode*)oldParent index:(int)index;
 - (void)nodeChanged:(bookmarks::BookmarkModel*)model
@@ skipping 11 matching lines @@
 - (void)nodeChildrenReordered:(bookmarks::BookmarkModel*)model
                          node:(const bookmarks::BookmarkNode*)node;
 @end
 
 // These APIs should only be used by unit tests (or used internally).
 @interface BookmarkBarController(InternalOrTestingAPI)
 - (void)openBookmarkFolder:(id)sender;
 - (void)openOrCloseBookmarkFolderForOffTheSideButton;
 - (BookmarkBarView*)buttonView;
 - (NSMutableArray*)buttons;
+- (NSButton*)offTheSideButton;
 - (NSButton*)appsPageShortcutButton;
 - (BOOL)offTheSideButtonIsHidden;
 - (BOOL)appsPageShortcutButtonIsHidden;
 - (BookmarkButton*)otherBookmarksButton;
 - (BookmarkBarFolderController*)folderController;
 - (id)folderTarget;
 - (int)displayedButtonCount;
 - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition;
 - (void)clearBookmarkBar;
 - (BookmarkButtonCell*)cellForBookmarkNode:(const bookmarks::BookmarkNode*)node;
 - (BookmarkButtonCell*)cellForCustomButtonWithText:(NSString*)text
                                              image:(NSImage*)image;
 - (NSRect)frameForBookmarkButtonFromCell:(NSCell*)cell xOffset:(int*)xOffset;
 - (void)checkForBookmarkButtonGrowth:(NSButton*)button;
 - (void)frameDidChange;
 - (int64_t)nodeIdFromMenuTag:(int32_t)tag;
 - (int32_t)menuTagFromNodeId:(int64_t)menuid;
 - (void)updateTheme:(const ui::ThemeProvider*)themeProvider;
 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
 - (BOOL)isEventAnExitEvent:(NSEvent*)event;
 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX;
 - (void)unhighlightBookmark:(const bookmarks::BookmarkNode*)node;
 
 // The following are for testing purposes only and are not used internally.
 - (NSMenu *)menuForFolderNode:(const bookmarks::BookmarkNode*)node;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_