[Mac] Changes to the behavior of Lion+ fullscreen and presentation mode.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1021 matching lines @@
           // We simply check whether the item has a keyboard shortcut set here;
           // app_controller_mac.mm actually determines whether the item should
           // be enabled.
           if ([static_cast<NSObject*>(item) isKindOfClass:[NSMenuItem class]])
             enable &= !![[static_cast<NSMenuItem*>(item) keyEquivalent] length];
           break;
         case IDC_FULLSCREEN: {
           enable &= [self supportsFullscreen];
           if ([static_cast<NSObject*>(item) isKindOfClass:[NSMenuItem class]]) {
             NSString* menuTitle = l10n_util::GetNSString(
-                [self isFullscreen] ? IDS_EXIT_FULLSCREEN_MAC :
-                                      IDS_ENTER_FULLSCREEN_MAC);
+                [self isFullscreen] && ![self inPresentationMode] ?
+                    IDS_EXIT_FULLSCREEN_MAC :
+                    IDS_ENTER_FULLSCREEN_MAC);
             [static_cast<NSMenuItem*>(item) setTitle:menuTitle];
 
             if (base::mac::IsOSSnowLeopardOrEarlier())
               [static_cast<NSMenuItem*>(item) setHidden:YES];
           }
           break;
         }
         case IDC_PRESENTATION_MODE: {
           enable &= [self supportsFullscreen];
           if ([static_cast<NSObject*>(item) isKindOfClass:[NSMenuItem class]]) {
@@ skipping 967 matching lines @@
 
   // Presentation mode on Leopard and Snow Leopard maps directly to fullscreen
   // mode.
   if (base::mac::IsOSSnowLeopardOrEarlier()) {
     [self setFullscreen:presentationMode url:url bubbleType:bubbleType];
     return;
   }
 
   if (presentationMode) {
     BOOL fullscreen = [self isFullscreen];
-    BOOL fullscreen_for_tab =
-        browser_->fullscreen_controller()->IsFullscreenForTabOrPending();
-    if (!fullscreen_for_tab)
-      [self setShouldUsePresentationModeWhenEnteringFullscreen:YES];
     enteredPresentationModeFromFullscreen_ = fullscreen;
+    enteringPresentationMode_ = YES;
 
     if (fullscreen) {
       // If already in fullscreen mode, just toggle the presentation mode
       // setting.  Go through an elaborate dance to force the overlay to show,
       // then animate out once the mouse moves away.  This helps draw attention
       // to the fact that the UI is in an overlay.  Focus the tab contents
       // because the omnibox is the most likely source of bar visibility locks,
       // and taking focus away from the omnibox releases its lock.
       [self lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
       [self focusTabContents];
       [self setPresentationModeInternal:YES forceDropdown:YES];
       [self releaseBarVisibilityForOwner:self withAnimation:YES delay:YES];
       // Since -windowDidEnterFullScreen: won't be called in the
       // fullscreen --> presentation mode case, manually show the exit bubble.
       [self showFullscreenExitBubbleIfNecessary];
     } else {
       // If not in fullscreen mode, trigger the Lion fullscreen mode machinery.
       // Presentation mode will automatically be enabled in
       // |-windowWillEnterFullScreen:|.
       NSWindow* window = [self window];
       if ([window isKindOfClass:[FramedBrowserWindow class]])
         [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
     }
   } else {
-    if (enteredPresentationModeFromFullscreen_) {
-      // The window is currently in fullscreen mode, but the user is choosing to
-      // turn presentation mode off (choosing to always show the UI).  Set the
-      // preference to ensure that presentation mode will stay off for the next
-      // window that goes fullscreen.
-      [self setShouldUsePresentationModeWhenEnteringFullscreen:NO];
-      [self setPresentationModeInternal:NO forceDropdown:NO];
-      // Since -windowWillExitFullScreen: won't be called in the
-      // presentation mode --> fullscreen case, manually hide the exit bubble.
-      [self destroyFullscreenExitBubbleIfNecessary];
-    } else {
-      // The user entered presentation mode directly from non-fullscreen mode
-      // using the "Enter Presentation Mode" menu item and is using that same
-      // menu item to exit presentation mode.  In this case, exit fullscreen
-      // mode as well (using the Lion machinery).
-      NSWindow* window = [self window];
-      if ([window isKindOfClass:[FramedBrowserWindow class]])
-        [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
-    }
+    // The user is currently in presentation mode and is now exiting it, which
+    // also exits fullscreen using the Lion machinery.
+    NSWindow* window = [self window];
+    if ([window isKindOfClass:[FramedBrowserWindow class]])
+      [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
   }
 }
 
 - (void)enterPresentationModeForURL:(const GURL&)url
                          bubbleType:(FullscreenExitBubbleType)bubbleType {
   [self setPresentationMode:YES url:url bubbleType:bubbleType];
 }
 
 - (void)exitPresentationMode {
   // url: and bubbleType: are ignored when leaving presentation mode.
@@ skipping 129 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)