[Mac] Implements popups for Page Actions, plus fixes a leak within the Browse...

chrome/browser/cocoa/location_bar_view_mac.mm

 // Copyright (c) 2009 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/cocoa/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #include "chrome/browser/cocoa/event_utils.h"
+#import "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 481 matching lines @@
 
 LocationBarViewMac::PageActionImageView::~PageActionImageView() {
   if (tracker_)
     tracker_->StopTrackingImageLoad();
 }
 
 // Overridden from LocationBarImageView. Either notify listeners or show a
 // popup depending on the Page Action.
 bool LocationBarViewMac::PageActionImageView::OnMousePressed(NSRect bounds) {
   if (page_action_->has_popup()) {
-      NOTIMPLEMENTED();
+    AutocompleteTextField* textField = owner_->GetAutocompleteTextField();
+    NSWindow* window = [textField window];
+    NSRect relativeBounds = [[window contentView] convertRect:bounds
+                                                     fromView:textField];
+    NSPoint arrowPoint = [window convertBaseToScreen:NSMakePoint(
+        NSMinX(relativeBounds),
+        NSMinY(relativeBounds))];
+
+    // Adjust the anchor point to be at the center of the page action icon.
+    arrowPoint.x += [GetImage() size].width / 2;

[Mark Mentovai, 2009/12/18 21:37:25]

NSWidth([GetImage() size]) / 2 ?

+
+    popupController_ =
+        [ExtensionPopupController showURL:page_action_->popup_url()
+                                inBrowser:BrowserList::GetLastActive()
+                               anchoredAt:arrowPoint
+                            arrowLocation:kTopRight];
     } else {
       ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
           profile_, page_action_->extension_id(), page_action_->id(),
           current_tab_id_, current_url_.spec(),
           1);  // TODO(pamg): Add support for middle and right buttons.
   }
   return true;
 }
 
 void LocationBarViewMac::PageActionImageView::OnImageLoaded(SkBitmap* image,
@@ skipping 68 matching lines @@
   SetVisible(visible);
 }
 
 void LocationBarViewMac::PageActionImageView::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
-      //if (!popup_ || Details<ExtensionHost>(popup_->host()) != details)
-      //  return;
-
-      //HidePopup();
-      NOTIMPLEMENTED();
+      if (popupController_ &&
+          Details<ExtensionHost>([popupController_ host]) == details) {
+        HidePopup();
+      }
       break;
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
+void LocationBarViewMac::PageActionImageView::HidePopup() {
+  [popupController_ close];
+  popupController_ = nil;
+}
+
 // PageActionViewList-----------------------------------------------------------
 
 void LocationBarViewMac::PageActionViewList::DeleteAll() {
   if (!views_.empty()) {
     STLDeleteContainerPointers(views_.begin(), views_.end());
     views_.clear();
   }
 }
 
 void LocationBarViewMac::PageActionViewList::RefreshViews() {
@@ skipping 70 matching lines @@
     if (views_[i]->IsVisible())
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }