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

chrome/browser/extensions/extension_toolbar_model.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 
+#include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/web_contents.h"
 
 using extensions::Extension;
 using extensions::ExtensionList;
 
 ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service)
     : service_(service),
       prefs_(service->profile()->GetPrefs()),
       extensions_initialized_(false) {
   DCHECK(service_);
 
@@ skipping 45 matching lines @@
     index = toolitems_.size();
 
     toolitems_.push_back(make_scoped_refptr(extension));
   }
 
   FOR_EACH_OBSERVER(Observer, observers_, BrowserActionMoved(extension, index));
 
   UpdatePrefs();
 }
 
-void ExtensionToolbarModel::ExecuteBrowserAction(
-    const std::string& extension_id, Browser* browser) {
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    BrowserActionExecuted(extension_id, browser));
+ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
+    const Extension* extension,
+    Browser* browser,
+    GURL* popup_url_out) {
+  TabContentsWrapper* tab_contents = browser->GetSelectedTabContentsWrapper();
+  if (!tab_contents)
+    return ACTION_NONE;
+
+  int tab_id = ExtensionTabUtil::GetTabId(tab_contents->web_contents());
+  if (tab_id < 0)
+    return ACTION_NONE;
+
+  ExtensionAction* browser_action = extension->browser_action();
+  if (browser_action->HasPopup(tab_id)) {
+    if (popup_url_out)
+      *popup_url_out = browser_action->GetPopupUrl(tab_id);
+    return ACTION_SHOW_POPUP;
+  }
+
+  service_->browser_event_router()->BrowserActionExecuted(
+      extension->id(), browser);
+  return ACTION_NONE;
 }
 
 void ExtensionToolbarModel::SetVisibleIconCount(int count) {
   visible_icon_count_ = count == static_cast<int>(size()) ? -1 : count;
   prefs_->SetInteger(prefs::kExtensionToolbarSize, visible_icon_count_);
 }
 
 void ExtensionToolbarModel::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 166 matching lines @@
   int incognito_index = 0, i = 0;
   for (ExtensionList::iterator iter = begin(); iter != end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled((*iter)->id()))
       ++incognito_index;
   }
   return incognito_index;
 }