Chromium Code Reviews| 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..60a680283b5e84bfbc071c99c80182fdf82e6a45 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,11 @@ willAnimateFromState:(BookmarkBar::State)oldState |
| - (void)enterWebContentFullscreenForURL:(const GURL&)url |
| bubbleType:(ExclusiveAccessBubbleType)bubbleType { |
| - [self enterImmersiveFullscreen]; |
| + if (chrome::mac::SupportsSystemFullscreen() && base::mac::IsOSLionOrLater()) |
|
Robert Sesek
2015/10/08 15:21:22
Is the condition after && necessary?
spqchan
2015/10/08 16:54:28
It's not. I removed it
|
| + [self enterAppKitFullscreen]; |
| + else |
| + [self enterImmersiveFullscreen]; |
| + |
| if (!url.is_empty()) |
| [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; |
| } |