[Mac] Simplify getting page-action info-bubble point.

chrome/browser/cocoa/extension_installed_bubble_controller.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.
 
 #import "extension_installed_bubble_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
@@ skipping 125 matching lines @@
   [self close];
 }
 
 // Extracted to a function here so that it can be overwritten for unit
 // testing.
 - (void)removePageActionPreviewIfNecessary {
   DCHECK(extension_);
   if (!extension_->page_action() || pageActionRemoved_)
     return;
   pageActionRemoved_ = YES;
-  BrowserWindowCocoa* window = static_cast<BrowserWindowCocoa*>(
-      browser_->window());
-  LocationBarViewMac* locationBarView = static_cast<LocationBarViewMac*>(
-      [[window->cocoa_controller() toolbarController] locationBarBridge]);
 
+  BrowserWindowCocoa* window =
+      static_cast<BrowserWindowCocoa*>(browser_->window());
+  LocationBarViewMac* locationBarView =
+      [window->cocoa_controller() locationBarBridge];
   locationBarView->SetPreviewEnabledPageAction(extension_->page_action(),
                                                false);  // disables preview.
 }
 
 // The extension installed bubble points at the browser action icon or the
 // page action icon (shown as a preview), depending on the extension type.
 // We need to calculate the location of these icons and the size of the
 // message itself (which varies with the title of the extension) in order
 // to figure out the origin point for the extension installed bubble.
 // TODO(mirandac): add framework to easily test extension UI components!
 - (NSPoint)calculateArrowPoint {
   BrowserWindowCocoa* window =
       static_cast<BrowserWindowCocoa*>(browser_->window());
   NSPoint arrowPoint = NSZeroPoint;
 
   switch(type_) {
     case extension_installed_bubble::kBrowserAction: {
       BrowserActionsController* controller =
           [[window->cocoa_controller() toolbarController]
               browserActionsController];
       arrowPoint = [controller popupPointForBrowserAction:extension_];
       break;
     }
     case extension_installed_bubble::kPageAction: {
       LocationBarViewMac* locationBarView =
-          static_cast<LocationBarViewMac*>(
-              [[window->cocoa_controller() toolbarController]
-               locationBarBridge]);
+          [window->cocoa_controller() locationBarBridge];
+
       // Tell the location bar to show a preview of the page action icon, which
       // would ordinarily only be displayed on a page of the appropriate type.
       // We remove this preview when the extension installed bubble closes.
       locationBarView->SetPreviewEnabledPageAction(extension_->page_action(),
                                                    true);
 
       // Find the center of the bottom of the page action icon.
-      const NSRect frame =
-          locationBarView->GetPageActionFrame(extension_->page_action());
-      arrowPoint = NSMakePoint(NSMidX(frame), NSMinY(frame));
+      arrowPoint =
+          locationBarView->GetPageActionBubblePoint(extension_->page_action());
       break;
     }
     default: {
       NOTREACHED() << "Generic extension type not allowed in install bubble.";
     }
   }
   return arrowPoint;
 }
 
 // We want this to be a child of a browser window.  addChildWindow:
@@ skipping 125 matching lines @@
 
 - (NSRect)getPageActionInfoMsgFrame {
   return [pageActionInfoMsg_ frame];
 }
 
 - (NSRect)getExtensionInstalledInfoMsgFrame {
   return [extensionInstalledInfoMsg_ frame];
 }
 
 @end