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 |