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

chrome/browser/ui/cocoa/browser_window_controller_private.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_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 492 matching lines @@
   toolbarFrame.size.height = newHeight;
   NSRect bookmarkFrame = [[bookmarkBarController_ view] frame];
   bookmarkFrame.size.height = bookmarkFrame.size.height - deltaH;
   [[toolbarController_ view] setFrame:toolbarFrame];
   [[bookmarkBarController_ view] setFrame:bookmarkFrame];
   [self layoutSubviews];
 }
 
 // Fullscreen and presentation mode methods
 
-- (BOOL)shouldUsePresentationModeWhenEnteringFullscreen {
-  return browser_->profile()->GetPrefs()->GetBoolean(
-      prefs::kPresentationModeEnabled);
-}
-
-- (void)setShouldUsePresentationModeWhenEnteringFullscreen:(BOOL)flag {
-  browser_->profile()->GetPrefs()->SetBoolean(
-      prefs::kPresentationModeEnabled, flag);
-}
-
 - (BOOL)shouldShowPresentationModeToggle {
   return base::mac::IsOSLionOrLater() && [self isFullscreen];
 }
 
 - (void)moveViewsForFullscreenForSnowLeopardOrEarlier:(BOOL)fullscreen
     regularWindow:(NSWindow*)regularWindow
     fullscreenWindow:(NSWindow*)fullscreenWindow {
   // This method is only for Snow Leopard and earlier.
   DCHECK(base::mac::IsOSSnowLeopardOrEarlier());
 
@@ skipping 269 matching lines @@
   return (opt |
           NSApplicationPresentationAutoHideDock |
           NSApplicationPresentationAutoHideMenuBar);
 }
 
 - (void)windowWillEnterFullScreen:(NSNotification*)notification {
   [self registerForContentViewResizeNotifications];
 
   NSWindow* window = [self window];
   savedRegularWindowFrame_ = [window frame];
-  BOOL mode = [self shouldUsePresentationModeWhenEnteringFullscreen];
-  mode = mode ||
-         browser_->fullscreen_controller()->IsFullscreenForTabOrPending();
+  BOOL mode = enteringPresentationMode_ ||
+       browser_->fullscreen_controller()->IsFullscreenForTabOrPending();
   enteringFullscreen_ = YES;
   [self setPresentationModeInternal:mode forceDropdown:NO];
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
   if (base::mac::IsOSLionOrLater())
     [self deregisterForContentViewResizeNotifications];
   enteringFullscreen_ = NO;
+  enteringPresentationMode_ = NO;
   [self showFullscreenExitBubbleIfNecessary];
   browser_->WindowFullscreenStateChanged();
 }
 
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
   if (base::mac::IsOSLionOrLater())
     [self registerForContentViewResizeNotifications];
   [self destroyFullscreenExitBubbleIfNecessary];
   [self setPresentationModeInternal:NO forceDropdown:NO];
 }
@@ skipping 36 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)