Fix OS full-screen button on FutureCat

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 "app/mac/scoped_nsdisable_screen_updates.h"
 #include "app/mac/nsimage_cache.h"
@@ skipping 139 matching lines @@
 - (NSRect)_growBoxRect;
 
 @end
 
 // 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)toggleFullScreen:(id)sender;
 - (void)setRestorable:(BOOL)flag;
 @end
 
-enum {
-  NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
-  NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
-};
-
-enum {
-  NSWindowFullScreenButton = 7
-};
-
 #endif  // MAC_OS_X_VERSION_10_7
 
 // IncognitoImageView subclasses NSView to allow mouse events to pass through it
 // so you can drag the window by dragging on the spy guy.
 @interface IncognitoImageView : NSView {
  @private
   scoped_nsobject<NSImage> image_;
 }
 
 - (void)setImage:(NSImage*)image;
@@ skipping 227 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];
 
-    // For versions of Mac OS that provide an "enter fullscreen" button, make
-    // one appear (in a rather hacky manner). http://crbug.com/74065 : When
-    // switching the fullscreen implementation to the new API, revisit how much
-    // of this hacky code is necessary.
-    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];
-    }
+    [self setUpOSFullScreenButton];
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->CloseAllTabs();
   [downloadShelfController_ exiting];
@@ skipping 1609 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)