Change the conditions on which the popup blocked animation is shown to be more reliable.

chrome/browser/cocoa/popup_blocked_animation_mac.mm

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/popup_blocked_animation.h"
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
 #import "base/nsimage_cache_mac.h"
 #import "chrome/browser/cocoa/animatable_image.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 
 class PopupBlockedAnimationObserver;
 
 // A class for managing the Core Animation popup blocked animation.
 @interface PopupBlockedAnimationMac : NSObject {
  @private
   // The observer for the TabContents we are drawing on.
   scoped_ptr<PopupBlockedAnimationObserver> observer_;
   AnimatableImage* animation_;
 };
 
-// Called by our the Observer if the tab is hidden or closed.
-- (void)animationComplete;
+// Called by the Observer if the tab is hidden or closed.
+- (void)closeAnimation;
 
 @end
 
 // A helper class to monitor tab hidden and closed notifications. If we receive
 // such a notification, we stop the animation.
 class PopupBlockedAnimationObserver : public NotificationObserver {
  public:
   PopupBlockedAnimationObserver(PopupBlockedAnimationMac* owner,
                                 TabContents* tab_contents)
       : owner_(owner),
         tab_contents_(tab_contents) {
     registrar_.Add(this,
                    NotificationType::TAB_CONTENTS_HIDDEN,
                    Source<TabContents>(tab_contents_));
     registrar_.Add(this,
                    NotificationType::TAB_CONTENTS_DESTROYED,
                    Source<TabContents>(tab_contents_));
   }
 
   // Runs when a tab is hidden or destroyed. Let our owner know we should end
   // the animation.
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details) {
     // This ends up deleting us.
-    [owner_ animationComplete];
+    [owner_ closeAnimation];
   }
 
  private:
   // The object we need to inform when we get a notification. Weak.
   PopupBlockedAnimationMac* owner_;
 
   // The tab we are observing. Weak.
   TabContents* tab_contents_;
 
   // Used for registering to receive notifications and automatic clean up.
@@ skipping 89 matching lines @@
     [animation_ startAnimation];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
+- (void)closeAnimation {
+  [animation_ close];
+}
+
+// When the animation window closes, release self.
 - (void)windowWillClose:(NSNotification*)notification {
   DCHECK([[notification object] isEqual:animation_]);
-  [self animationComplete];
-}
-
-- (void)animationComplete {
   [[animation_ parentWindow] removeChildWindow:animation_];
   [self release];
 }
 
 @end
 
 void PopupBlockedAnimation::Show(TabContents* tab_contents) {
   // The object will clean up itself at the end of the animation.
   [[PopupBlockedAnimationMac alloc] initWithTabContents:tab_contents];
 }