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

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

Issue 7599029: Grab bag of bugfixes for Lion fullscreen mode. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Remove unneeded include. Created 9 years, 4 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 212e31e1c39d1036a602644c4386ba6bacebb99a..024760945c4c7d6c0238c8d770ee008cb35b87cc 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -274,9 +274,13 @@ enum {
[window setAnimationBehavior:NSWindowAnimationBehaviorDocumentWindow];
// Set the window to participate in Lion Fullscreen mode. Setting this flag
- // has no effect on Snow Leopard or earlier.
+ // has no effect on Snow Leopard or earlier. Popups and the devtools panel
+ // can share a fullscreen space with a tabbed window, but they can not be
+ // primary fullscreen windows.
NSUInteger collectionBehavior = [window collectionBehavior];
- collectionBehavior |= NSWindowCollectionBehaviorFullScreenPrimary;
+ collectionBehavior |= browser_->type() == Browser::TYPE_TABBED ?
+ NSWindowCollectionBehaviorFullScreenPrimary :
+ NSWindowCollectionBehaviorFullScreenAuxiliary;
[window setCollectionBehavior:collectionBehavior];
// Get the most appropriate size for the window, then enforce the

Powered by Google App Engine
This is Rietveld 408576698