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"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window_state.h"
-#import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
@@ skipping 736 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 398 matching lines @@
 - (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
+                    delegate:self
                        frame:savedRegularWindowFrame_
       tabStripBackgroundView:[self tabStripBackgroundView]]);
 
   NSArray* customWindows =
       [fullscreenTransition_ customWindowsForFullScreenTransition];
   isUsingCustomAnimation_ = customWindows != nil;
   return customWindows;
 }
 
 - (void)window:(NSWindow*)window
@@ skipping 29 matching lines @@
   return nil;
 }
 
 - (BOOL)isFullscreenForTabContent {
   return browser_->exclusive_access_manager()
                  ->fullscreen_controller()
                  ->IsWindowFullscreenForTabOrPending();
 }
 
 @end  // @implementation BrowserWindowController(Private)