| 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];
|
| }
|
|
|