| Index: chrome/browser/cocoa/browser_window_controller.mm
|
| diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
|
| index 0d13ce158d6aa7789715c7b1bc406f6d06c86276..658b100bc006e2c5941e91568b792a36b1bdf45c 100644
|
| --- a/chrome/browser/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/cocoa/browser_window_controller.mm
|
| @@ -43,7 +43,6 @@
|
| #import "chrome/browser/cocoa/tab_strip_controller.h"
|
| #import "chrome/browser/cocoa/tab_view.h"
|
| #import "chrome/browser/cocoa/toolbar_controller.h"
|
| -#include "chrome/browser/net/url_fixer_upper.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| #include "chrome/browser/sync/sync_ui_util_mac.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -836,10 +835,6 @@ willPositionSheet:(NSWindow*)sheet
|
| return enable;
|
| }
|
|
|
| -- (ToolbarController*)toolbarController {
|
| - return toolbarController_.get();
|
| -}
|
| -
|
| // Called when the user picks a menu or toolbar item when this window is key.
|
| // Calls through to the browser object to execute the command. This assumes that
|
| // the command is supported and doesn't check, otherwise it would have been
|
| @@ -1011,7 +1006,11 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
|
|
| - (TabStripController*)tabStripController {
|
| - return tabStripController_;
|
| + return tabStripController_.get();
|
| +}
|
| +
|
| +- (ToolbarController*)toolbarController {
|
| + return toolbarController_.get();
|
| }
|
|
|
| - (void)setIsLoading:(BOOL)isLoading {
|
| @@ -1545,20 +1544,6 @@ willAnimateFromState:(bookmarks::VisualState)oldState
|
| isShrinkingFromZoomed_ = NO;
|
| }
|
|
|
| -// Our implementation of the |URLDropTargetWindowController| protocol just
|
| -// reflects everything to the |tabStripController_|.
|
| -- (void)dropURLs:(NSArray*)urls at:(NSPoint)location {
|
| - [tabStripController_ dropURLs:urls at:location];
|
| -}
|
| -
|
| -- (void)indicateDropURLsAt:(NSPoint)location {
|
| - [tabStripController_ indicateDropURLsAt:location];
|
| -}
|
| -
|
| -- (void)hideDropURLsIndicator {
|
| - [tabStripController_ hideDropURLsIndicator];
|
| -}
|
| -
|
| @end
|
|
|
| @implementation BrowserWindowController (Private)
|
|
|