[Mac] Make popup-blocked animation animate to content-setting icon.

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.
@@ skipping 87 matching lines @@
     NSRect contentFrame = [[animation_ contentView] frame];
     [animation_ setStartFrame:CGRectMake(0,
                                          imageHeight / 2,
                                          imageWidth,
                                          imageHeight)];
 
     // Set the end frame to be small (a la the actual blocked icon) and inset
     // slightly to the Omnibox. While the geometry won't align perfectly, it's
     // close enough for the user to take note of the new icon. These numbers
     // come from measuring the Omnibox without any page actions.
-    [animation_ setEndFrame:CGRectMake(animationFrame.size.width - 115,
-                                       animationFrame.size.height - 50,
-                                       16, 16)];
+    CGRect endFrame = CGRectMake(animationFrame.size.width - 115,
+                                 animationFrame.size.height - 50,
+                                 16, 16);
+
+    // If the location-bar can be found, ask it for better
+    // coordinates.
+    BrowserWindowController* bwc = [parentWindow windowController];
+    if ([bwc isKindOfClass:[BrowserWindowController class]]) {
+      LocationBarViewMac* lbvm = [bwc locationBarBridge];
+      if (lbvm) {
+        NSRect frame = lbvm->GetBlockedPopupRect();
+        if (!NSIsEmptyRect(frame)) {
+          // Convert up to the screen, then back down to the animation
+          // window.
+          NSPoint screenPoint = [parentWindow convertBaseToScreen:frame.origin];
+          frame.origin = [animation_ convertScreenToBase:screenPoint];
+          endFrame = NSRectToCGRect(frame);
+        }
+      }
+    }
+
+    [animation_ setEndFrame:endFrame];
     [animation_ setStartOpacity:1.0];
     [animation_ setEndOpacity:0.2];
     [animation_ setDuration:0.7];
 
     observer_.reset(new PopupBlockedAnimationObserver(self, tabContents));
 
     // When the window is about to close, release this object and remove the
     // animation from the parent window.
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
@@ skipping 19 matching lines @@
   [[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];
 }