Pull browser action click logic into ToolbarModelController, so that when I

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 "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/sys_string_conversions.h"
@@ skipping 703 matching lines @@
     }
   } else if (![hiddenButtons_ containsObject:button]) {
     [hiddenButtons_ addObject:button];
     [button removeFromSuperview];
     [button setAlphaValue:0.0];
     [self updateOverflowMenu];
   }
 }
 
 - (void)browserActionClicked:(BrowserActionButton*)button {
-  int tabId = [self currentTabId];
-  if (tabId < 0) {
-    NOTREACHED() << "No current tab.";
-    return;
-  }
-  // If an extension popup is already open, it will get closed when it
-  // loses focus.
-
-  ExtensionAction* action = [button extension]->browser_action();
-  if (action->HasPopup(tabId)) {
-    GURL popupUrl = action->GetPopupUrl(tabId);
-    NSPoint arrowPoint = [self popupPointForBrowserAction:[button extension]];
-    [ExtensionPopupController showURL:popupUrl
-                            inBrowser:browser_
-                           anchoredAt:arrowPoint
-                        arrowLocation:info_bubble::kTopRight
-                              devMode:NO];
-  } else {
-    toolbarModel_->ExecuteBrowserAction(action->extension_id(), browser_);
+  const Extension* extension = [button extension];
+  GURL popupUrl;
+  switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl)) {
+    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;
+    }
   }
 }
 
 - (BOOL)shouldDisplayBrowserAction:(const Extension*)extension {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
 }
 
@@ skipping 107 matching lines @@
   if (profile_->IsOffTheRecord())
     index = toolbarModel_->IncognitoIndexToOriginal(index);
   if (index < toolbarModel_->size()) {
     const Extension* extension = toolbarModel_->GetExtensionByIndex(index);
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end