Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
index dd1a17e38c9ef7eb841c78882b186b64e9cd0444..4cb7f64a97a344d6f78531014ed674a1822679e7 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
@@ -35,15 +35,6 @@ |
#if !defined(MAC_OS_X_VERSION_10_7) || \ |
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
-@interface NSWindow (LionSDKDeclarations) |
-- (void)toggleFullScreen:(id)sender; |
-@end |
- |
-enum { |
- NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, |
- NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8 |
-}; |
- |
enum { |
NSWindowFullScreenButton = 7 |
}; |
@@ -199,7 +190,9 @@ willPositionSheet:(NSWindow*)sheet |
// with higher values, and then lay out the tab strip. |
NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil]; |
startMaxY = maxY = NSHeight(windowFrame) + yOffset; |
- maxY = [self layoutTabStripAtMaxY:maxY width:width fullscreen:isFullscreen]; |
+ maxY = [self layoutTabStripAtMaxY:maxY |
+ width:width |
+ fullscreen:isFullscreen || [self isLionFullScreen]]; |
} |
// Sanity-check |maxY|. |
@@ -548,18 +541,4 @@ willPositionSheet:(NSWindow*)sheet |
[fullscreenController_ cancelAnimationAndTimers]; |
} |
-- (void)setUpOSFullScreenButton { |
- NSWindow* window = [self window]; |
- if ([window respondsToSelector:@selector(toggleFullScreen:)]) { |
- NSWindowCollectionBehavior behavior = [window collectionBehavior]; |
- behavior |= NSWindowCollectionBehaviorFullScreenPrimary; |
- [window setCollectionBehavior:behavior]; |
- |
- NSButton* fullscreenButton = |
- [window standardWindowButton:NSWindowFullScreenButton]; |
- [fullscreenButton setAction:@selector(enterFullscreen:)]; |
- [fullscreenButton setTarget:self]; |
- } |
-} |
- |
@end // @implementation BrowserWindowController(Private) |