[Extensions] Refactor extension action execution

chrome/browser/extensions/api/extension_action/extension_action_api.h

Index: chrome/browser/extensions/api/extension_action/extension_action_api.h
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h
index 193e3313b17c04ed272d01f171b6aae6567c6d98..f6c5d588f9ea81b35bd71dbc36be9ba59b24e71b 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h
@@ -78,15 +78,6 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI {
   void SetBrowserActionVisibility(const std::string& extension_id,
                                   bool visible);
 
-  // Executes the action of the given |extension| on the |browser|'s active
-  // web contents. If |grant_tab_permissions| is true, this will also grant
-  // activeTab to the extension (so this should only be done if this is through
-  // a direct user action). Returns the action that should be taken.
-  ExtensionAction::ShowAction ExecuteExtensionAction(
-      const Extension* extension,
-      Browser* browser,
-      bool grant_active_tab_permissions);
-
   // Opens the popup for the given |extension| in the given |browser|'s window.
   // If |grant_active_tab_permissions| is true, this grants the extension
   // activeTab (so this should only be done if this is through a direct user
@@ -95,21 +86,15 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI {
                                 Browser* browser,
                                 bool grant_active_tab_permissions);
 
-  // Returns true if the |extension| has a visible page action on the given
-  // |web_contents|.
-  bool PageActionWantsToRun(const Extension* extension,
-                            content::WebContents* web_contents);
-
-  // Returns true if the |extension| has a blocked script that wants to inject
-  // on the given |web_contents|.
-  bool HasBeenBlocked(const Extension* extension,
-                      content::WebContents* web_contents);
-
   // Notifies that there has been a change in the given |extension_action|.
   void NotifyChange(ExtensionAction* extension_action,
                     content::WebContents* web_contents,
                     content::BrowserContext* browser_context);
 
+  // Dispatches the onClicked event for extension that owns the given action.
+  void DispatchExtensionActionClicked(const ExtensionAction& extension_action,
+                                      content::WebContents* web_contents);
+
   // Clears the values for all ExtensionActions for the tab associated with the
   // given |web_contents| (and signals that page actions changed).
   void ClearAllValuesForTab(content::WebContents* web_contents);
@@ -135,11 +120,6 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI {
                                 const std::string& event_name,
                                 scoped_ptr<base::ListValue> event_args);
 
-  // Called when either a browser or page action is executed. Figures out which
-  // event to send based on what the extension wants.
-  void ExtensionActionExecuted(const ExtensionAction& extension_action,
-                               content::WebContents* web_contents);
-
   // BrowserContextKeyedAPI implementation.
   void Shutdown() override;
   static const char* service_name() { return "ExtensionActionAPI"; }