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 669949574dab1f95ba69c7b21803b425dd121215..5d5a1d3d01feb9a6212bbb93cd158e2a0978a19f 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
@@ -523,16 +523,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]; |
} |
@@ -822,9 +812,8 @@ willPositionSheet:(NSWindow*)sheet |
NSWindow* window = [self window]; |
savedRegularWindowFrame_ = [window frame]; |
- BOOL mode = [self shouldUsePresentationModeWhenEnteringFullscreen]; |
- mode = mode || |
- browser_->fullscreen_controller()->IsFullscreenForTabOrPending(); |
+ BOOL mode = enteringPresentationMode_ || |
rohitrao (ping after 24h)
2012/07/22 11:50:44
Is this variable basically replacing the functiona
Robert Sesek
2012/07/23 17:57:53
Yes. I switched it to an ivar because there's also
|
+ browser_->fullscreen_controller()->IsFullscreenForTabOrPending(); |
enteringFullscreen_ = YES; |
[self setPresentationModeInternal:mode forceDropdown:NO]; |
} |
@@ -833,6 +822,7 @@ willPositionSheet:(NSWindow*)sheet |
if (base::mac::IsOSLionOrLater()) |
[self deregisterForContentViewResizeNotifications]; |
enteringFullscreen_ = NO; |
+ enteringPresentationMode_ = NO; |
[self showFullscreenExitBubbleIfNecessary]; |
browser_->WindowFullscreenStateChanged(); |
} |