[Mac] Remove bookmark bar NIB

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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_controller.h"
 
 #include <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 303 matching lines @@
 }
 
 - (BookmarkBarToolbarView*)controlledView {
   return base::mac::ObjCCastStrict<BookmarkBarToolbarView>([self view]);
 }
 
 - (BookmarkContextMenuCocoaController*)menuController {
   return contextMenuController_.get();
 }
 
+- (void)loadView {
+  // Height is 0 because this is what the superview expects
+  [self setView:[[[BookmarkBarToolbarView alloc]
+                    initWithFrame:NSMakeRect(0, 0, initialWidth_, 0)]
+                    autorelease]];
+  [[self view] setHidden:YES];
+  [[self view] setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+  [[self controlledView] setController:self];
+  [[self controlledView] setDelegate:self];
+
+  buttonView_.reset([[BookmarkBarView alloc]
+      initWithController:self
+                   frame:NSMakeRect(0, -2, 584, 144)]);
+  [buttonView_ setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin |
+                                   NSViewMaxXMargin];
+  [[buttonView_ importBookmarksButton] setTarget:self];
+  [[buttonView_ importBookmarksButton] setAction:@selector(importBookmarks:)];
+
+  [self createOffTheSideButton];
+  [buttonView_ addSubview:offTheSideButton_];
+
+  [self.view addSubview:buttonView_];
+  // viewDidLoad became part of the API in 10.10
+  if (!base::mac::IsAtLeastOS10_10())
+    [self viewDidLoad];
+}
+
 - (BookmarkButton*)bookmarkButtonToPulseForNode:(const BookmarkNode*)node {
   // Find the closest parent that is visible on the bar.
   while (node) {
     // Check if we've reached one of the special buttons. Otherwise, if the next
     // parent is the boomark bar, find the corresponding button.
     if ([managedBookmarksButton_ bookmarkNode] == node)
       return managedBookmarksButton_;
 
     if ([supervisedBookmarksButton_ bookmarkNode] == node)
       return supervisedBookmarksButton_;
@@ skipping 39 matching lines @@
 - (void)stopPulsingBookmarkNode {
   if (!pulsingButton_)
     return;
 
   [pulsingButton_ setPulseIsStuckOn:NO];
   pulsingButton_.reset();
   pulsingBookmarkObserver_.reset();
 }
 
 - (void)dealloc {
+  [buttonView_ setController:nil];
+  [[self controlledView] setController:nil];
+  [[self controlledView] setDelegate:nil];
   [self browserWillBeDestroyed];
   [super dealloc];
 }
 
 - (void)browserWillBeDestroyed {
   // If |bridge_| is null it means -viewDidLoad has not yet been called, which
   // can only happen if the nib wasn't loaded. Retrieving it via -[self view]
   // would load it now, but it's too late for that, so let it be nil. Note this
   // should only happen in tests.
   BookmarkBarToolbarView* view = nil;
@@ skipping 21 matching lines @@
     [button setTarget:nil];
     [button setAction:nil];
   }
 
   bridge_.reset(NULL);
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [self watchForExitEvent:NO];
   browser_ = nullptr;
 }
 
-- (void)awakeFromNib {
-  [self viewDidLoad];
-}
-
 - (void)viewDidLoad {
-  if (bridge_) {
-    // When running on 10.10, expect both -awakeFromNib and -viewDidLoad to be
-    // called, but only initialize once.
-    DCHECK(base::mac::IsAtLeastOS10_10());
-    return;
-  }
-
-  // We default to NOT open, which means height=0.
-  DCHECK([[self view] isHidden]);  // Hidden so it's OK to change.
-
-  // Set our initial height to zero, since that is what the superview
-  // expects.  We will resize ourselves open later if needed.
-  [[self view] setFrame:NSMakeRect(0, 0, initialWidth_, 0)];
-
-  // Complete init of the "off the side" button, as much as we can.
-  [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
-  BookmarkButtonCell* offTheSideCell = [offTheSideButton_ cell];
-  [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
-  [offTheSideCell setImagePosition:NSImageOnly];
-
-  // The cell is configured in the nib to draw a white highlight when clicked.
-  [offTheSideCell setHighlightsBy:NSNoCellMask];
-  [offTheSideButton_.draggableButton setDraggable:NO];
-  [offTheSideButton_.draggableButton setActsOnMouseDown:YES];
-
   // We are enabled by default.
   barIsEnabled_ = YES;
 
   // Remember the original sizes of the 'no items' and 'import bookmarks'
   // fields to aid in resizing when the window frame changes.
   originalNoItemsRect_ = [[buttonView_ noItemTextfield] frame];
   originalImportBookmarksRect_ = [[buttonView_ importBookmarksButton] frame];
 
   // Bookmark buttons start farther from the bookmark bar's left edge so
   // adjust the positions of the noItems and importBookmarks textfields.
   const CGFloat kBookmarksTextfieldOffsetX = 14;
   originalNoItemsRect_.origin.x += kBookmarksTextfieldOffsetX;
   [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
 
   originalImportBookmarksRect_.origin.x += kBookmarksTextfieldOffsetX;
   [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
 
-  // Move the chevron button up 2pts from its position in the xib.
-  NSRect chevronButtonFrame = [offTheSideButton_ frame];
-  chevronButtonFrame.origin.y -= 2;
-  [offTheSideButton_ setFrame:chevronButtonFrame];
-
-  // To make life happier when the bookmark bar is floating, the chevron is a
-  // child of the button view.
-  [offTheSideButton_ removeFromSuperview];
-  [buttonView_ addSubview:offTheSideButton_];
-
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
   [[self view] setPostsFrameChangedNotifications:YES];
   [[NSNotificationCenter defaultCenter]
     addObserver:self
        selector:@selector(frameDidChange)
            name:NSViewFrameDidChangeNotification
          object:[self view]];
 
   // Watch for things going to or from fullscreen.
@@ skipping 339 matching lines @@
   DCHECK([sender isKindOfClass:[BookmarkButton class]]);
   DCHECK([[sender cell] isKindOfClass:[BookmarkButtonCell class]]);
 
   // Only record the action if it's the initial folder being opened.
   if (!showFolderMenus_)
     RecordBookmarkFolderOpen([self bookmarkLaunchLocation]);
   showFolderMenus_ = !showFolderMenus_;
 
   // Middle click on chevron should not open bookmarks under it, instead just
   // open its folder menu.
-  if (sender == offTheSideButton_) {
+  if (sender == offTheSideButton_.get()) {
     [[sender cell] setStartingChildIndex:displayedButtonCount_];
     NSEvent* event = [NSApp currentEvent];
     if ([event type] == NSOtherMouseUp) {
       [self openOrCloseBookmarkFolderForOffTheSideButton];
       return;
     }
   }
   // Toggle presentation of bar folder menus.
   [folderTarget_ openBookmarkFolderFromButton:sender];
 }
 
 - (void)openOrCloseBookmarkFolderForOffTheSideButton {
   // If clicked on already opened folder, then close it and return.
   if ([folderController_ parentButton] == offTheSideButton_)
     [self closeBookmarkFolder:self];
   else
     [self addNewFolderControllerWithParentButton:offTheSideButton_];
 }
 
 // Click on a bookmark folder button.
-- (IBAction)openBookmarkFolderFromButton:(id)sender {
+- (void)openBookmarkFolderFromButton:(id)sender {
   [self openBookmarkFolder:sender];
 }
 
 // Click on the "off the side" button (chevron), which opens like a folder
 // button but isn't exactly a parent folder.
-- (IBAction)openOffTheSideFolderFromButton:(id)sender {
+- (void)openOffTheSideFolderFromButton:(id)sender {
   [self openBookmarkFolder:sender];
 }
 
-- (IBAction)importBookmarks:(id)sender {
+- (void)importBookmarks:(id)sender {
   chrome::ShowImportDialog(browser_);
 }
 
 - (NSButton*)appsPageShortcutButton {
   return appsPageShortcutButton_;
 }
 
 - (NSButton*)offTheSideButton {
   return offTheSideButton_;
 }
@@ skipping 534 matching lines @@
   [[appsPageShortcutButton_ draggableButton] setActsOnMouseDown:NO];
   [appsPageShortcutButton_ setAction:@selector(openAppsPage:)];
   NSString* tooltip =
       l10n_util::GetNSString(IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP);
   [appsPageShortcutButton_ setToolTip:tooltip];
   [buttonView_ addSubview:appsPageShortcutButton_.get()];
 
   [self setAppsPageShortcutButtonVisibility];
 }
 
+- (void)createOffTheSideButton {
+  offTheSideButton_.reset(
+      [[BookmarkButton alloc] initWithFrame:NSMakeRect(586, 0, 20, 24)]);
+  id offTheSideCell = [BookmarkButtonCell offTheSideButtonCell];
+  [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
+  [offTheSideCell setImagePosition:NSImageOnly];
+
+  [offTheSideCell setHighlightsBy:NSNoCellMask];
+  [offTheSideCell setShowsBorderOnlyWhileMouseInside:YES];
+  [offTheSideCell setBezelStyle:NSShadowlessSquareBezelStyle];
+  [offTheSideButton_ setCell:offTheSideCell];
+  [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
+  [offTheSideButton_ setButtonType:NSMomentaryLightButton];
+
+  [offTheSideButton_ setTarget:self];
+  [offTheSideButton_ setAction:@selector(openOffTheSideFolderFromButton:)];
+  [offTheSideButton_ setDelegate:self];
+  [[offTheSideButton_ draggableButton] setDraggable:NO];
+  [[offTheSideButton_ draggableButton] setActsOnMouseDown:YES];
+}
+
 - (void)openAppsPage:(id)sender {
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   [self openURL:GURL(chrome::kChromeUIAppsURL) disposition:disposition];
   RecordBookmarkAppsPageOpen([self bookmarkLaunchLocation]);
 }
 
 // To avoid problems with sync, changes that may impact the current
 // bookmark (e.g. deletion) make sure context menus are closed.  This
 // prevents deleting a node which no longer exists.
@@ skipping 511 matching lines @@
       // If the click is in my window but NOT in the bookmark bar, consider
       // it a click 'outside'. Clicks directly on an active button (i.e. one
       // that is a folder and for which its folder menu is showing) are 'in'.
       // All other clicks on the bookmarks bar are counted as 'outside'
       // because they should close any open bookmark folder menu.
       if (eventWindow == myWindow) {
         NSView* hitView =
             [[eventWindow contentView] hitTest:[event locationInWindow]];
         if (hitView == [folderController_ parentButton])
           return NO;
-        if (![hitView isDescendantOf:[self view]] || hitView == buttonView_)
+        if (![hitView isDescendantOf:[self view]] ||
+            hitView == buttonView_.get())
           return YES;
       }
       // If a click in a bookmark bar folder window and that isn't
       // one of my bookmark bar folders, YES is click outside.
       if (![eventWindow isKindOfClass:[BookmarkBarFolderWindow
                                        class]]) {
         return YES;
       }
       break;
     case NSKeyDown: {
@@ skipping 972 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end