| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/browser_window_controller_private.mm (revision 129471)
|
| +++ chrome/browser/ui/cocoa/browser_window_controller_private.mm (working copy)
|
| @@ -676,7 +676,7 @@
|
| return;
|
|
|
| if (presentationMode) {
|
| - BOOL fullscreen_for_tab = browser_->IsFullscreenForTabOrPending();
|
| + BOOL fullscreen_for_tab = browser_->IsFullscreenForTab();
|
| BOOL showDropdown = !fullscreen_for_tab &&
|
| (forceDropdown || [self floatingBarHasFocus]);
|
| NSView* contentView = [[self window] contentView];
|
| @@ -789,7 +789,7 @@
|
| }
|
|
|
| - (void)showFullscreenExitBubbleIfNecessary {
|
| - if (!browser_->IsFullscreenForTabOrPending()) {
|
| + if (!browser_->IsFullscreenForTab()) {
|
| return;
|
| }
|
|
|
| @@ -851,7 +851,7 @@
|
| NSWindow* window = [self window];
|
| savedRegularWindowFrame_ = [window frame];
|
| BOOL mode = [self shouldUsePresentationModeWhenEnteringFullscreen];
|
| - mode = mode || browser_->IsFullscreenForTabOrPending();
|
| + mode = mode || browser_->IsFullscreenForTab();
|
| enteringFullscreen_ = YES;
|
| [self setPresentationModeInternal:mode forceDropdown:NO];
|
| }
|
|
|
| Property changes on: chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|