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

chrome/browser/cocoa/extensions/browser_actions_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 
 class Browser;
 @class BrowserActionButton;
 class Extension;
+@class ExtensionPopupController;
 class ExtensionsServiceObserverBridge;
 class Profile;
 
 extern const CGFloat kBrowserActionButtonPadding;
 extern const CGFloat kBrowserActionWidth;
 
 extern NSString* const kBrowserActionsChangedNotification;
 
 @interface BrowserActionsController : NSObject {
  @private
   // Reference to the current browser. Weak.
   Browser* browser_;
 
   // The view from Toolbar.xib we'll be rendering our browser actions in. Weak.
   NSView* containerView_;
 
   // The current profile. Weak.
   Profile* profile_;
 
   // The observer for the ExtensionsService we're getting events from.
   scoped_ptr<ExtensionsServiceObserverBridge> observer_;
 
   // A dictionary of Extension ID -> BrowserActionButton pairs representing the
   // buttons present in the container view. The ID is a string unique to each
   // extension.
   scoped_nsobject<NSMutableDictionary> buttons_;
 
   // The order of the BrowserActionButton objects within the dictionary.
   scoped_nsobject<NSMutableArray> buttonOrder_;
+
+  // The controller for the popup displayed if a browser action has one. Weak.
+  ExtensionPopupController* popupController_;
 }
 
 // Initializes the controller given the current browser and container view that
 // will hold the browser action buttons.
 - (id)initWithBrowser:(Browser*)browser
         containerView:(NSView*)container;
 
 // Creates and appends any existing browser action buttons present within the
 // extensions service to the toolbar.
 - (void)createButtons;
 
 // Hides the browser action's popup menu (if one is present and visible).
 - (void)hidePopup;
 
+// Returns the controller used to display the popup being shown. If no popup is
+// currently open, then nil is returned.
+- (ExtensionPopupController*)popup;
+
 // Marks the container view for redraw. Called by the extension service
 // notification bridge.
 - (void)browserActionVisibilityHasChanged;
 
 // Returns the current number of browser action buttons displayed in the
 // container.
 - (int)buttonCount;
 
 // Executes the action designated by the extension.
 - (void)browserActionClicked:(BrowserActionButton*)sender;
 
 // Returns the current ID of the active tab, -1 in the case where the user is in
 // incognito mode.
 - (int)currentTabId;
 
 @end  // @interface BrowserActionsController
 
 #endif  // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_