| 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 4bf62accb76e8b1eb2c448bdc30d731d2b147143..046e7527c81c2e1a92070b5fe438c30fd3d472e0 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -217,6 +217,8 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
|
|
| - (void)layoutSubviews {
|
| + // TODO(spqchan): Change blockLayoutSubviews so that it only blocks the web
|
| + // content from resizing.
|
| if (blockLayoutSubviews_)
|
| return;
|
|
|
| @@ -748,6 +750,7 @@ willPositionSheet:(NSWindow*)sheet
|
| enteringPresentationMode_ = NO;
|
|
|
| [self showFullscreenExitBubbleIfNecessary];
|
| + [self layoutSubviews];
|
| browser_->WindowFullscreenStateChanged();
|
| }
|
|
|
| @@ -807,7 +810,7 @@ willPositionSheet:(NSWindow*)sheet
|
| ->fullscreen_controller()
|
| ->IsWindowFullscreenForTabOrPending()) {
|
| style = fullscreen_mac::OMNIBOX_TABS_NONE;
|
| - } else if (enteringPresentationMode_) {
|
| + } else if (enteringPresentationMode_ || [self shouldHideFullscreenToolbar]) {
|
| style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
|
| } else {
|
| style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
|
|
|