| Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| index e83dd26656dfca24e929f25c7b0b758963ae2d7a..bee28087eb69274f25b34dbd33ce242df1b79605 100644
|
| --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
| @@ -9,6 +9,7 @@
|
| #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"
|
| @@ -121,10 +122,6 @@ CGFloat BrowserActionsContainerDelegate::GetMaxAllowedWidth() {
|
|
|
| } // namespace
|
|
|
| -@interface ToolbarController (YosemiteSDK)
|
| -- (void)viewDidLoad;
|
| -@end
|
| -
|
| @interface ToolbarController()
|
| @property(assign, nonatomic) Browser* browser;
|
| - (void)cleanUp;
|
| @@ -265,12 +262,7 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate {
|
| // 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;
|
| }
|
|
|
|
|