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

chrome/browser/ui/cocoa/browser_window_controller_private.mm

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 684c9b2bb6672b939efa0bac6e6cb345108b5da5..c0c44b89e1e31e8cdf3482360be12671e4974bb5 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -510,16 +510,6 @@ willPositionSheet:(NSWindow*)sheet
 
 // 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];
 }
@@ -809,9 +799,8 @@ willPositionSheet:(NSWindow*)sheet
 
   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];
 }
@@ -820,6 +809,7 @@ willPositionSheet:(NSWindow*)sheet
   if (base::mac::IsOSLionOrLater())
     [self deregisterForContentViewResizeNotifications];
   enteringFullscreen_ = NO;
+  enteringPresentationMode_ = NO;
   [self showFullscreenExitBubbleIfNecessary];
   browser_->WindowFullscreenStateChanged();
 }