| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| index 7d872ec21c640cc876f5ad25861fe7945860a7c6..c9c6224ab6b621c1d9d08f38a3fecbddadda4a81 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -453,12 +453,6 @@ willPositionSheet:(NSWindow*)sheet
|
| manager->UpdateAnchorPosition();
|
| }
|
|
|
| -- (void)configureFullscreenToolbarController {
|
| - NSView* contentView = [[self window] contentView];
|
| - [fullscreenToolbarController_
|
| - setupFullscreenToolbarForContentView:contentView];
|
| -}
|
| -
|
| - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
|
| [fullscreenToolbarController_ exitFullscreenMode];
|
| fullscreenToolbarController_.reset();
|
| @@ -476,7 +470,7 @@ willPositionSheet:(NSWindow*)sheet
|
| if (!fullscreenToolbarController_) {
|
| fullscreenToolbarController_.reset(
|
| [self newFullscreenToolbarControllerWithStyle:style]);
|
| - [self configureFullscreenToolbarController];
|
| + [fullscreenToolbarController_ enterFullscreenMode];
|
| } else {
|
| fullscreenToolbarController_.get().slidingStyle = style;
|
| }
|
| @@ -999,7 +993,7 @@ willPositionSheet:(NSWindow*)sheet
|
| if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) {
|
| [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame];
|
| [fullscreenToolbarController_
|
| - setTrackingAreaFromOverlayFrame:output.fullscreenBackingBarFrame];
|
| + updateToolbarFrame:output.fullscreenBackingBarFrame];
|
| }
|
|
|
| [findBarCocoaController_
|
|
|