| Index: chrome/browser/ui/cocoa/browser_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| index 6444bbce94fb7c45801a7a0a15062afe12f7b5b8..85089bbe28044e8f852f66a05636371cd9e16588 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| @@ -1948,13 +1948,18 @@ willAnimateFromState:(bookmarks::VisualState)oldState
|
| enteredPresentationModeFromFullscreen_ = YES;
|
| if ([[self window] isKindOfClass:[FramedBrowserWindow class]])
|
| [static_cast<FramedBrowserWindow*>([self window]) toggleSystemFullScreen];
|
| - return;
|
| + } else {
|
| + if (fullscreen)
|
| + [self enterFullscreenForSnowLeopardOrEarlier];
|
| + else
|
| + [self exitFullscreenForSnowLeopardOrEarlier];
|
| }
|
|
|
| - if (fullscreen)
|
| - [self enterFullscreenForSnowLeopardOrEarlier];
|
| - else
|
| - [self exitFullscreenForSnowLeopardOrEarlier];
|
| + if (fullscreen) {
|
| + [self showFullscreenExitBubbleIfNecessary];
|
| + } else {
|
| + [self destroyFullscreenExitBubbleIfNecessary];
|
| + }
|
| }
|
|
|
| - (BOOL)isFullscreen {
|
| @@ -1985,7 +1990,9 @@ willAnimateFromState:(bookmarks::VisualState)oldState
|
|
|
| if (presentationMode) {
|
| BOOL fullscreen = [self isFullscreen];
|
| - [self setShouldUsePresentationModeWhenEnteringFullscreen:YES];
|
| + BOOL fullscreen_for_tab = browser_->is_fullscreen_for_tab();
|
| + if (!fullscreen_for_tab)
|
| + [self setShouldUsePresentationModeWhenEnteringFullscreen:YES];
|
| enteredPresentationModeFromFullscreen_ = fullscreen;
|
|
|
| if (fullscreen) {
|
| @@ -2007,6 +2014,8 @@ willAnimateFromState:(bookmarks::VisualState)oldState
|
| if ([window isKindOfClass:[FramedBrowserWindow class]])
|
| [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
|
| }
|
| +
|
| + [self showFullscreenExitBubbleIfNecessary];
|
| } else {
|
| if (enteredPresentationModeFromFullscreen_) {
|
| // The window is currently in fullscreen mode, but the user is choosing to
|
| @@ -2024,6 +2033,8 @@ willAnimateFromState:(bookmarks::VisualState)oldState
|
| if ([window isKindOfClass:[FramedBrowserWindow class]])
|
| [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
|
| }
|
| +
|
| + [self destroyFullscreenExitBubbleIfNecessary];
|
| }
|
| }
|
|
|
|
|