Implement initial chrome.browserAction.openPopup API.

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 101 matching lines @@
 - (void)actionButtonDragFinished:(NSNotification*)notification;
 
 // Moves the given button both visually and within the toolbar model to the
 // specified index.
 - (void)moveButton:(BrowserActionButton*)button
            toIndex:(NSUInteger)index
            animate:(BOOL)animate;
 
 // Handles when the given BrowserActionButton object is clicked.
 - (void)browserActionClicked:(BrowserActionButton*)button;
+- (void)browserActionClicked:(BrowserActionButton*)button
+                    andGrant:(BOOL)shouldGrant;
 
 // Returns whether the given extension should be displayed. Only displays
 // incognito-enabled extensions in incognito mode. Otherwise returns YES.
 - (BOOL)shouldDisplayBrowserAction:(const Extension*)extension;
 
 // The reason |frame| is specified in these chevron functions is because the
 // container may be animating and the end frame of the animation should be
 // passed instead of the current frame (which may be off and cause the chevron
 // to jump at the end of its animation).
 
@@ skipping 79 matching lines @@
       int index) OVERRIDE {
     [owner_ createActionButtonForExtension:extension withIndex:index];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
   virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE {
     [owner_ removeActionButtonForExtension:extension];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
+  virtual void BrowserActionShowPopup(const Extension* extension) OVERRIDE {
+    // Do not override other popups and only show in active window.
+    ExtensionPopupController* popup = [ExtensionPopupController popup];
+    if (popup ||
+        BrowserList::GetInstance(chrome::GetActiveDesktop())->GetLastActive() !=
+            browser_) {
+      return;
+    }
+
+    BrowserActionButton* button = [owner_ buttonForExtension:extension];
+    if (button) {
+      [owner_ browserActionClicked:button
+                          andGrant:false];
+    }
+  }
+
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
 
   // The browser we listen for events from. Weak.
   Browser* browser_;
 
   // Used for registering to receive notifications and automatic clean up.
   content::NotificationRegistrar registrar_;
 
@@ skipping 481 matching lines @@
       [button setAlphaValue:1.0];
       [hiddenButtons_ removeObjectIdenticalTo:button];
     }
   } else if (![hiddenButtons_ containsObject:button]) {
     [hiddenButtons_ addObject:button];
     [button removeFromSuperview];
     [button setAlphaValue:0.0];
   }
 }
 
-- (void)browserActionClicked:(BrowserActionButton*)button {
+- (void)browserActionClicked:(BrowserActionButton*)button
+                    andGrant:(BOOL)shouldGrant {
   const Extension* extension = [button extension];
   GURL popupUrl;
-  switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl)) {
+  switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl,
+                                              shouldGrant)) {
     case ExtensionToolbarModel::ACTION_NONE:
       break;
     case ExtensionToolbarModel::ACTION_SHOW_POPUP: {
       NSPoint arrowPoint = [self popupPointForBrowserAction:extension];
       [ExtensionPopupController showURL:popupUrl
                               inBrowser:browser_
                              anchoredAt:arrowPoint
                           arrowLocation:info_bubble::kTopRight
                                 devMode:NO];
       break;
     }
   }
 }
 
+- (void)browserActionClicked:(BrowserActionButton*)button {
+  [self browserActionClicked:button
+                    andGrant:true];
+}
+
 - (BOOL)shouldDisplayBrowserAction:(const Extension*)extension {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        extensions::ExtensionSystem::Get(profile_)->extension_service()->
            IsIncognitoEnabled(extension->id()));
 }
 
 - (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate {
   [self setChevronHidden:([self buttonCount] == [self visibleButtonCount])
@@ skipping 93 matching lines @@
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
     const Extension* extension = toolbar_items[index].get();
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end