Lion: Need to use new full-screen API

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 134 matching lines @@
 @interface NSWindow (NSPrivateApis)
 // Note: These functions are private, use -[NSObject respondsToSelector:]
 // before calling them.
 
 - (void)setBottomCornerRounded:(BOOL)rounded;
 
 - (NSRect)_growBoxRect;
 
 @end
 
 // Provide the forward-declarations of new 10.7 SDK symbols so they can be

[Mark Mentovai, 2011/07/13 14:46:04]

10.6, not 10.7.

 // called when building with the 10.5 SDK.
+#if !defined(MAC_OS_X_VERSION_10_6) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+
+typedef NSUInteger NSApplicationPresentationOptions;
+
+@interface NSApplication (LionSDKDeclarations)

[Mark Mentovai, 2011/07/13 14:46:04]

SnowLeopard, not Lion.

+- (NSApplicationPresentationOptions)currentSystemPresentationOptions;
+@end
+
+#endif  // MAC_OS_X_VERSION_10_6
+
+// Provide the forward-declarations of new 10.7 SDK symbols so they can be
+// called when building with the 10.5 SDK.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSWindow (LionSDKDeclarations)
 - (void)setRestorable:(BOOL)flag;
 @end
 
+enum {
+  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
+  NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
+};
+
+enum {
+  NSApplicationPresentationFullScreen = 1 << 10
+};
+
 #endif  // MAC_OS_X_VERSION_10_7
 
 
 @implementation BrowserWindowController
 
 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window {
   while (window) {
     id controller = [window windowController];
     if ([controller isKindOfClass:[BrowserWindowController class]])
       return (BrowserWindowController*)controller;
@@ skipping 183 matching lines @@
          addObserver:self
             selector:@selector(applicationDidUnhide:)
                 name:NSApplicationDidUnhideNotification
               object:nil];
 
     // This must be done after the view is added to the window since it relies
     // on the window bounds to determine whether to show buttons or not.
     if ([self hasToolbar])  // Do not create the buttons in popups.
       [toolbarController_ createBrowserActionButtons];
 
-    [self setUpOSFullScreenButton];
+    NSWindowCollectionBehavior behavior = [[self window] collectionBehavior];
+    behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
+    [[self window] setCollectionBehavior:behavior];
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
 
 - (void)awakeFromNib {
   // Set different minimum sizes on tabbed windows vs non-tabbed, e.g. popups.
   NSSize minSize = [self isTabbedWindow] ?
@@ skipping 1497 matching lines @@
 }
 
 - (void)sheetDidEnd:(NSWindow*)sheet
          returnCode:(NSInteger)code
             context:(void*)context {
   [sheet orderOut:self];
 }
 
 @end  // @implementation BrowserWindowController
 
+@implementation BrowserWindowController(LionFullScreen)
+
+- (NSSize)window:(NSWindow *)window
+    willUseFullScreenContentSize:(NSSize)proposedSize {
+  [window setFrame:NSMakeRect(0, 0, proposedSize.width, proposedSize.height)
+           display:YES
+           animate:NO];
+  [self layoutSubviews];
+  return proposedSize;
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification {
+  [self layoutSubviews];
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification {
+  [self layoutSubviews];
+}
+
+- (BOOL)isLionFullScreen {
+  return !!([NSApp currentSystemPresentationOptions] &
+      NSApplicationPresentationFullScreen);
+}
+
+@end  // @implementation BrowserWindowController(LionFullScreen)
+
 
 @implementation BrowserWindowController(Fullscreen)
 
 - (IBAction)enterFullscreen:(id)sender {
   browser_->ExecuteCommand(IDC_FULLSCREEN);
 }
 
 - (void)setFullscreen:(BOOL)fullscreen {
   // The logic in this function is a bit complicated and very carefully
   // arranged.  See the below comments for more details.
@@ skipping 134 matching lines @@
       NSWindowCollectionBehaviorMoveToActiveSpace];
   [destWindow makeKeyAndOrderFront:self];
   [destWindow setCollectionBehavior:behavior];
 
   [focusTracker restoreFocusInWindow:destWindow];
   [window orderOut:self];
 
   // We're done moving focus, so re-enable bar visibility changes.
   [self enableBarVisibilityUpdates];
 
-  // This needs to be done when leaving full-screen mode to ensure that the
-  // button's action is set properly.
-  [self setUpOSFullScreenButton];
-
   // Fade back in.
   if (didFadeOut) {
     CGDisplayFade(token, kFadeDurationSeconds / 2, kCGDisplayBlendSolidColor,
         kCGDisplayBlendNormal, 0.0, 0.0, 0.0, /*synchronous=*/false);
     CGReleaseDisplayFadeReservation(token);
   }
 }
 
 - (BOOL)isFullscreen {
   return fullscreenController_.get() && [fullscreenController_ isFullscreen];
@@ skipping 123 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)