Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1537)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 1387473002: Switch HTML5 Fullscreen Over to AppKit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing line Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c4205301f799e87d52ba2ceacf4e8451191d9afc..42fd0f810777e44521b04bcee855d0df0c1e56ce 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1966,7 +1966,11 @@ willAnimateFromState:(BookmarkBar::State)oldState
- (void)enterWebContentFullscreenForURL:(const GURL&)url
bubbleType:(ExclusiveAccessBubbleType)bubbleType {
- [self enterImmersiveFullscreen];
+ if (chrome::mac::SupportsSystemFullscreen() && base::mac::IsOSLionOrLater())
+ [self exitAppKitFullscreen];
erikchen 2015/10/07 21:51:03 I'm confused - should this be enterAppKitFullscree
spqchan 2015/10/07 22:54:01 Whoops, yes this should be enterAppKitFullscreen
erikchen 2015/10/07 23:17:53 adjustUIForEnteringFullscreen relies on enteringPr
spqchan 2015/10/07 23:53:26 In adjustUIForEnteringFullscreen, we check if the
+ else
+ [self enterImmersiveFullscreen];
+
if (!url.is_empty())
[self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
}

Powered by Google App Engine
This is Rietveld 408576698