Fixed a fullscreen race condition on OSX

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2012 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_private.h"
 
 #include <cmath>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 760 matching lines @@
     [self.chromeContentView setAutoresizesSubviews:NO];
     [self setSheetHiddenForFullscreenTransition:YES];
   } else {
     [self adjustUIForExitingFullscreen];
   }
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
   DCHECK(exitingAppKitFullscreen_);
 
+  // If the custom transition isn't complete, then just set the flag and
+  // return. Once the transition is completed, windowDidExitFullscreen will
+  // be called again.
+  if (isUsingCustomAnimation_ &&
+      ![fullscreenTransition_ isTransitionCompleted]) {
+    appKitDidExitFullscreen_ = YES;
+    return;
+  }
+
   if (notification)  // For System Fullscreen when non-nil.
     [self deregisterForContentViewResizeNotifications];
 
   browser_->WindowFullscreenStateChanged();
   [self.chromeContentView setAutoresizesSubviews:YES];
 
   [self resetCustomAppKitFullscreenVariables];
 
   // Ensures that the permission bubble shows up properly at the front.
   PermissionBubbleManager* manager = [self permissionBubbleManager];
@@ skipping 377 matching lines @@
   exitingAppKitFullscreen_ = NO;
   isUsingCustomAnimation_ = NO;
 }
 
 - (NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow*)window {
   DCHECK([window isEqual:self.window]);
 
   if (![self shouldUseCustomAppKitFullscreenTransition:YES])
     return nil;
 
-  FramedBrowserWindow* framedBrowserWindow =
-      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
-  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
-      initEnterWithWindow:framedBrowserWindow]);
+  fullscreenTransition_.reset(
+      [[BrowserWindowFullscreenTransition alloc] initEnterWithController:self]);
 
   NSArray* customWindows =
       [fullscreenTransition_ customWindowsForFullScreenTransition];
   isUsingCustomAnimation_ = customWindows != nil;
   return customWindows;
 }
 
 - (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
   DCHECK([window isEqual:self.window]);
 
   if (![self shouldUseCustomAppKitFullscreenTransition:NO])
     return nil;
 
-  FramedBrowserWindow* framedBrowserWindow =
-      base::mac::ObjCCast<FramedBrowserWindow>([self window]);
-  fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc]
-          initExitWithWindow:framedBrowserWindow
-                       frame:savedRegularWindowFrame_
-      tabStripBackgroundView:[self tabStripBackgroundView]]);
+  fullscreenTransition_.reset(
+      [[BrowserWindowFullscreenTransition alloc] initExitWithController:self]);
 
   NSArray* customWindows =
       [fullscreenTransition_ customWindowsForFullScreenTransition];
   isUsingCustomAnimation_ = customWindows != nil;
   return customWindows;
 }
 
 - (void)window:(NSWindow*)window
     startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
   DCHECK([window isEqual:self.window]);
@@ skipping 27 matching lines @@
   return nil;
 }
 
 - (BOOL)isFullscreenForTabContent {
   return browser_->exclusive_access_manager()
                  ->fullscreen_controller()
                  ->IsWindowFullscreenForTabOrPending();
 }
 
 @end  // @implementation BrowserWindowController(Private)