Adds popups to browser actions, completing the feature....

chrome/browser/cocoa/extensions/browser_actions_controller.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 "browser_actions_controller.h"
 
 #include <string>
 
 #include "app/gfx/canvas_paint.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/browser/cocoa/toolbar_button_cell.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/extensions/image_loading_tracker.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 249 matching lines @@
         break;
       }
       case NotificationType::EXTENSION_UNLOADED:
       case NotificationType::EXTENSION_UNLOADED_DISABLED: {
         Extension* extension = Details<Extension>(details).ptr();
         [owner_ removeActionButtonForExtension:extension];
         [owner_ browserActionVisibilityHasChanged];
         break;
       }
       case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE:
-        //if (Details<ExtensionHost>(popup_->host()) != details)
-        //  return;
+        if (Details<ExtensionHost>([[owner_ popup] host]) != details)
+          return;
         [owner_ hidePopup];
         break;
       default:
         NOTREACHED() << L"Unexpected notification";
     }
   }
 
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
@@ skipping 18 matching lines @@
     [containerView_ setHidden:YES];
     observer_.reset(new ExtensionsServiceObserverBridge(self, profile_));
     buttons_.reset([[NSMutableDictionary alloc] init]);
     buttonOrder_.reset([[NSMutableArray alloc] init]);
   }
 
   return self;
 }
 
 - (void)hidePopup {
-  NOTIMPLEMENTED();
+  [popupController_ close];
+  popupController_ = nil;
+}
+
+- (ExtensionPopupController*)popup {
+  return popupController_;
 }
 
 - (void)browserActionVisibilityHasChanged {
   [containerView_ setNeedsDisplay:YES];
 }
 
 - (void)createButtons {
   ExtensionsService* extensionsService = profile_->GetExtensionsService();
   if (!extensionsService)  // |extensionsService| can be NULL in Incognito.
     return;
@@ skipping 63 matching lines @@
   }
 }
 
 - (int)buttonCount {
   return [buttons_ count];
 }
 
 - (void)browserActionClicked:(BrowserActionButton*)sender {
   ExtensionAction* action = [sender extension]->browser_action();
   if (action->has_popup()) {
-    // Popups are not implemented for Mac yet.
-    NOTIMPLEMENTED();
+    NSString* extensionId = base::SysUTF8ToNSString([sender extension]->id());
+    // If the extension ID is not valid UTF-8, then the NSString will be nil
+    // and an exception will be thrown when calling objectForKey below, hosing
+    // the browser. Check it.
+    DCHECK(extensionId);
+    if (!extensionId)
+      return;
+    BrowserActionButton* actionButton = [buttons_ objectForKey:extensionId];
+    NSRect relativeButtonBounds = [[[actionButton window] contentView]
+        convertRect:[actionButton bounds]
+           fromView:actionButton];
+    NSPoint arrowPoint = [[actionButton window] convertBaseToScreen:NSMakePoint(
+        NSMinX(relativeButtonBounds),
+        NSMinY(relativeButtonBounds))];
+    // Adjust the anchor point to be at the center of the browser action button.
+    arrowPoint.x += kBrowserActionWidth / 2;
+
+    popupController_ =
+        [[ExtensionPopupController showURL:action->popup_url()
+                                 inBrowser:browser_
+                                anchoredAt:arrowPoint
+                             arrowLocation:kTopRight] retain];
   } else {
     ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
        profile_, action->extension_id(), browser_);
   }
 }
 
 - (int)currentTabId {
   TabContents* selected_tab = browser_->GetSelectedTabContents();
   if (!selected_tab)
     return -1;
 
   return selected_tab->controller().session_id().id();
 }
 
 @end