Mac: Support 10.10's -[NSViewController viewDidLoad] for BookmarkBarController

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 "base/mac/bundle_locations.h"
+#include "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 126 matching lines @@
           enabled_extensions().GetAppByURL(url);
   if (!extension)
     return;
 
   extensions::RecordAppLaunchType(extension_misc::APP_LAUNCH_BOOKMARK_BAR,
                                   extension->GetType());
 }
 
 }  // namespace
 
-@interface BookmarkBarController(Private)
+@interface BookmarkBarController ()
 
 // Moves to the given next state (from the current state), possibly animating.
 // If |animate| is NO, it will stop any running animation and jump to the given
 // state. If YES, it may either (depending on implementation) jump to the end of
 // the current animation and begin the next one, or stop the current animation
 // mid-flight and animate to the next state.
 - (void)moveToState:(BookmarkBar::State)nextState
       withAnimation:(BOOL)animate;
 
 // Return the backdrop to the bookmark bar as various types.
@@ skipping 52 matching lines @@
 // buttons showing. If too many then show the off-the-side list, if none
 // then show the no items label.
 - (void)reconfigureBookmarkBar;
 
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu;
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu;
 - (void)tagEmptyMenu:(NSMenu*)menu;
 - (void)clearMenuTagMap;
 - (int)preferredHeight;
 - (void)addButtonsToView;
-- (BOOL)setBookmarkButtonVisibility;

[tapted, 2015/09/21 12:24:03]

(this isn't defined, and became an error when the category name was removed, but
I just noticed that change looks out of place now that the category adding
viewDidLoad got moved to sdk_forward_declarations :/. Happy to revert these bits
and put them in a follow-up, or leave them in this CL [forgot to send this CL
out before leaving work])

 - (BOOL)setManagedBookmarksButtonVisibility;
 - (BOOL)setSupervisedBookmarksButtonVisibility;
 - (BOOL)setOtherBookmarksButtonVisibility;
 - (BOOL)setAppsPageShortcutButtonVisibility;
 - (BookmarkButton*)createCustomBookmarkButtonForCell:(NSCell*)cell;
 - (void)createManagedBookmarksButton;
 - (void)createSupervisedBookmarksButton;
 - (void)createOtherBookmarksButton;
 - (void)createAppsPageShortcutButton;
 - (void)openAppsPage:(id)sender;
@@ skipping 155 matching lines @@
     [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::IsOSYosemiteOrLater());
+    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.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   [offTheSideButton_ setImage:
@@ skipping 2513 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