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

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: Add check for 10.10+ 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..dab2b112059b8cf3e3c8b2b2e9bb444550995346 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -421,6 +421,8 @@ using content::WebContents;
extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
windowShim_.get()));
+ blockLayoutSubviews_ = NO;
+
// We are done initializing now.
initializing_ = NO;
}
@@ -1966,7 +1968,13 @@ willAnimateFromState:(BookmarkBar::State)oldState
- (void)enterWebContentFullscreenForURL:(const GURL&)url
bubbleType:(ExclusiveAccessBubbleType)bubbleType {
- [self enterImmersiveFullscreen];
+ // HTML5 Fullscreen should only use AppKit fullscreen in 10.10+.
+ if (chrome::mac::SupportsSystemFullscreen() &&
+ base::mac::IsOSYosemiteOrLater())
+ [self enterAppKitFullscreen];
+ else
+ [self enterImmersiveFullscreen];
+
if (!url.is_empty())
[self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698