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

chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
+#include "base/mac/sdk_forward_declarations.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 92 matching lines @@
 }
 
 CGFloat BrowserActionsContainerDelegate::GetMaxAllowedWidth() {
   CGFloat location_bar_flex =
       NSWidth([location_bar_ frame]) - kMinimumLocationBarWidth;
   return NSWidth([browser_actions_container_ frame]) + location_bar_flex;
 }
 
 }  // namespace
 
-@interface ToolbarController (YosemiteSDK)
-- (void)viewDidLoad;
-@end
-
 @interface ToolbarController()
 @property(assign, nonatomic) Browser* browser;
 - (void)cleanUp;
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(const std::string&)prefName;
 - (BackgroundGradientView*)backgroundGradientView;
 - (void)toolbarFrameChanged;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
@@ skipping 120 matching lines @@
 // reason is not guaranteed to be called (http://crbug.com/526276), so implement
 // both.
 - (void)awakeFromNib {
   [self viewDidLoad];
 }
 
 - (void)viewDidLoad {
   // When linking and running on 10.10+, both -awakeFromNib and -viewDidLoad may
   // be called, don't initialize twice.
   if (locationBarView_) {
-#if defined(MAC_OS_X_VERSION_10_10) && \
-    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
     DCHECK(base::mac::IsOSYosemiteOrLater());
-#else
-    NOTREACHED();
-#endif
     return;
   }
 
   [[backButton_ cell] setImageID:IDR_BACK
                   forButtonState:image_button_cell::kDefaultState];
   [[backButton_ cell] setImageID:IDR_BACK_H
                   forButtonState:image_button_cell::kHoverState];
   [[backButton_ cell] setImageID:IDR_BACK_P
                   forButtonState:image_button_cell::kPressedState];
   [[backButton_ cell] setImageID:IDR_BACK_D
@@ skipping 674 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end