| 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 7d04649ebce586d6bf04a6afd59b6b2f4fa32096..8264076a93ac27fc2fd36486f6ab885dbf71feb7 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -225,6 +225,8 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
|
|
| - (void)layoutSubviews {
|
| + // TODO(spqchan): Change blockLayoutSubviews so that it only blocks the web
|
| + // content from resizing.
|
| if (blockLayoutSubviews_)
|
| return;
|
|
|
| @@ -764,6 +766,7 @@ willPositionSheet:(NSWindow*)sheet
|
| isUsingCustomAnimation_ = NO;
|
|
|
| [self showFullscreenExitBubbleIfNecessary];
|
| + [self layoutSubviews];
|
| browser_->WindowFullscreenStateChanged();
|
| }
|
|
|
| @@ -826,7 +829,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;
|
|
|