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"
@@ skipping 119 matching lines @@
 // when _any_ Browser Action button is done dragging to keep all open windows in
 // sync visually.
 - (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;
+// Handles when the given BrowserActionButton object is clicked and whether it
+// it should grant tab permissions. API-simulated clicks should not grant.

[Alexei Svitkine (slow), 2013/10/17 20:56:40]

Nit: Remove extra 'it'

[justinlin, 2013/10/17 21:33:59]

Done.

+- (bool)browserActionClicked:(BrowserActionButton*)button
+                 shouldGrant:(BOOL)shouldGrant;
+- (bool)browserActionClicked:(BrowserActionButton*)button;
 
 // 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 bool BrowserActionShowPopup(const Extension* extension) OVERRIDE {
+    // Do not override other popups and only show in active window.
+    ExtensionPopupController* popup = [ExtensionPopupController popup];
+    if (popup || !browser_->window()->IsActive())
+      return false;
+
+    BrowserActionButton* button = [owner_ buttonForExtension:extension];
+    return button && [owner_ browserActionClicked:button
+                                      shouldGrant:false];

[Alexei Svitkine (slow), 2013/10/17 20:56:40]

Nit: This is an Obj-C call, so change false -> NO here.

[justinlin, 2013/10/17 21:33:59]

Done.

+  }
+
  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 {
+- (bool)browserActionClicked:(BrowserActionButton*)button

[Alexei Svitkine (slow), 2013/10/17 20:56:40]

Nit: Change return value to BOOL and return YES/NO per Obj-C style.

[justinlin, 2013/10/17 21:33:59]

Done.

+                 shouldGrant:(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;
+      return true;
     }
   }
+  return false;
+}
+
+- (bool)browserActionClicked:(BrowserActionButton*)button {
+  return [self browserActionClicked:button];
 }
 
 - (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()));
 }
 
@@ skipping 95 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