Implement initial chrome.browserAction.openPopup API.

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 <string>
+
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.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/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
                        const extensions::ExtensionList& extension_list) {
   for (size_t i = 0; i < extension_list.size(); i++) {
     if (extension_list[i].get() == extension)
       return true;
   }
   return false;
 }
 
 }  // namespace
 
+bool ExtensionToolbarModel::Observer::BrowserActionShowPopup(
+    const extensions::Extension* extension) {
+  return false;
+}
+
 ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service)
     : service_(service),
       prefs_(service->profile()->GetPrefs()),
       extensions_initialized_(false),
       weak_ptr_factory_(this) {
   DCHECK(service_);
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(service_->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
@@ skipping 67 matching lines @@
   }
 
   FOR_EACH_OBSERVER(Observer, observers_, BrowserActionMoved(extension, index));
 
   UpdatePrefs();
 }
 
 ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
     const Extension* extension,
     Browser* browser,
-    GURL* popup_url_out) {
+    GURL* popup_url_out,
+    bool should_grant) {
   content::WebContents* web_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &web_contents, &tab_id))
     return ACTION_NONE;
 
   ExtensionAction* browser_action =
       extensions::ExtensionActionManager::Get(service_->profile())->
       GetBrowserAction(*extension);
 
   // For browser actions, visibility == enabledness.
   if (!browser_action->GetIsVisible(tab_id))
     return ACTION_NONE;
 
-  extensions::TabHelper::FromWebContents(web_contents)->
-      active_tab_permission_granter()->GrantIfRequested(extension);
+  if (should_grant) {
+    extensions::TabHelper::FromWebContents(web_contents)->
+        active_tab_permission_granter()->GrantIfRequested(extension);
+  }
 
   if (browser_action->HasPopup(tab_id)) {
     if (popup_url_out)
       *popup_url_out = browser_action->GetPopupUrl(tab_id);
     return ACTION_SHOW_POPUP;
   }
 
   extensions::ExtensionActionAPI::BrowserActionExecuted(
       service_->profile(), *browser_action, web_contents);
   return ACTION_NONE;
@@ skipping 290 matching lines @@
 
   if (last_known_positions_.size() > pref_position_size) {
     // Need to update pref because we have extra icons. But can't call
     // UpdatePrefs() directly within observation closure.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ExtensionToolbarModel::UpdatePrefs,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
+
+bool ExtensionToolbarModel::ShowBrowserActionPopup(
+    const extensions::Extension* extension) {
+  ObserverListBase<Observer>::Iterator it(observers_);
+  Observer* obs = NULL;
+  while ((obs = it.GetNext()) != NULL) {
+    // Stop after first popup since it should only show in the active window.
+    if (obs->BrowserActionShowPopup(extension))
+      return true;
+  }
+  return false;
+}