[Extensions] Refactor extension action execution

chrome/browser/extensions/extension_action_runner.cc

 // Copyright 2014 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_action_runner.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 50 matching lines @@
 
 // static
 ExtensionActionRunner* ExtensionActionRunner::GetForWebContents(
     content::WebContents* web_contents) {
   if (!web_contents)
     return NULL;
   TabHelper* tab_helper = TabHelper::FromWebContents(web_contents);
   return tab_helper ? tab_helper->extension_action_runner() : NULL;
 }
 
-void ExtensionActionRunner::OnActiveTabPermissionGranted(
-    const Extension* extension) {
-  if (WantsToRun(extension))
-    OnClicked(extension);
+ExtensionAction::ShowAction ExtensionActionRunner::RunAction(
+    const Extension* extension,
+    bool grant_tab_permissions) {
+  bool has_pending_scripts = WantsToRun(extension);
+  if (grant_tab_permissions) {
+    TabHelper::FromWebContents(web_contents())
+        ->active_tab_permission_granter()
+        ->GrantIfRequested(extension);
+    // If the extension had blocked actions, granting active tab will have
+    // run the extension. Don't execute further since clicking should run
+    // blocked actions *or* the normal extension action, not both.
+    if (has_pending_scripts)
+      return ExtensionAction::ACTION_NONE;
+  }
+
+  ExtensionAction* extension_action =
+      ExtensionActionManager::Get(browser_context_)
+          ->GetExtensionAction(*extension);
+
+  // Anything that gets here should have a page or browser action.
+  DCHECK(extension_action);
+  int tab_id = SessionTabHelper::IdForTab(web_contents());
+  if (!extension_action->GetIsVisible(tab_id))
+    return ExtensionAction::ACTION_NONE;
+
+  if (extension_action->HasPopup(tab_id))
+    return ExtensionAction::ACTION_SHOW_POPUP;
+
+  ExtensionActionAPI::Get(browser_context_)
+      ->DispatchExtensionActionClicked(*extension_action, web_contents());
+  return ExtensionAction::ACTION_NONE;
 }
 
-void ExtensionActionRunner::OnClicked(const Extension* extension) {
+void ExtensionActionRunner::RunBlockedActions(const Extension* extension) {
   DCHECK(ContainsKey(pending_scripts_, extension->id()) ||
          web_request_blocked_.count(extension->id()) != 0);
 
   // Clicking to run the extension counts as granting it permission to run on
   // the given tab.
   // The extension may already have active tab at this point, but granting
   // it twice is essentially a no-op.
   TabHelper::FromWebContents(web_contents())
       ->active_tab_permission_granter()
       ->GrantIfRequested(extension);
 
   RunPendingScriptsForExtension(extension);
   web_request_blocked_.erase(extension->id());
 
   // The extension ran, so we need to tell the ExtensionActionAPI that we no
   // longer want to act.
   NotifyChange(extension);
 }
 
+void ExtensionActionRunner::OnActiveTabPermissionGranted(
+    const Extension* extension) {
+  if (WantsToRun(extension))
+    RunBlockedActions(extension);
+}
+
 void ExtensionActionRunner::OnWebRequestBlocked(const Extension* extension) {
   web_request_blocked_.insert(extension->id());
 }
 
 int ExtensionActionRunner::GetBlockedActions(const Extension* extension) {
   int blocked_actions = BLOCKED_ACTION_NONE;
   if (web_request_blocked_.count(extension->id()) != 0)
     blocked_actions |= BLOCKED_ACTION_WEB_REQUEST;
   auto iter = pending_scripts_.find(extension->id());
   if (iter != pending_scripts_.end()) {
@@ skipping 204 matching lines @@
     UnloadedExtensionInfo::Reason reason) {
   PendingScriptMap::iterator iter = pending_scripts_.find(extension->id());
   if (iter != pending_scripts_.end()) {
     pending_scripts_.erase(iter);
     ExtensionActionAPI::Get(browser_context_)
         ->NotifyPageActionsChanged(web_contents());
   }
 }
 
 }  // namespace extensions