Consolidate ExtensionAction execution code

chrome/browser/extensions/active_script_controller.h

Index: chrome/browser/extensions/active_script_controller.h
diff --git a/chrome/browser/extensions/active_script_controller.h b/chrome/browser/extensions/active_script_controller.h
index 6e4a9edc343129be03f81ffdf03e2fe0e9748e92..945e385f431beab9dd9424efc2261a260350cbcd 100644
--- a/chrome/browser/extensions/active_script_controller.h
+++ b/chrome/browser/extensions/active_script_controller.h
@@ -58,14 +58,16 @@ class ActiveScriptController : public LocationBarController::ActionProvider,
   // |extension| permission to always run script injections on the origin.
   void AlwaysRunOnVisibleOrigin(const Extension* extension);
 
+  // Notifies the ActiveScriptController that the action for |extension| has
+  // been clicked, running any pending tasks that were previously shelved.
+  void OnClicked(const Extension* extension);
+
   // Returns true if there is an active script injection action for |extension|.
   bool HasActiveScriptAction(const Extension* extension);
 
   // LocationBarControllerProvider implementation.
   virtual ExtensionAction* GetActionForExtension(
       const Extension* extension) OVERRIDE;
-  virtual ExtensionAction::ShowAction OnClicked(
-      const Extension* extension) OVERRIDE;
   virtual void OnNavigated() OVERRIDE;
   virtual void OnExtensionUnloaded(const Extension* extension) OVERRIDE;
 
@@ -98,7 +100,6 @@ class ActiveScriptController : public LocationBarController::ActionProvider,
   void RequestScriptInjection(const Extension* extension,
                               const base::Closure& callback);
 
-  // Register a request for a script injection, to be executed by running
   // Runs any pending injections for the corresponding extension.
   void RunPendingForExtension(const Extension* extension);