[Extensions] Refactor extension action execution

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_ACTION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_ACTION_API_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 60 matching lines @@
       GetFactoryInstance();
 
   // Add or remove observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   bool GetBrowserActionVisibility(const std::string& extension_id);
   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
   // action).
   bool ShowExtensionActionPopup(const Extension* extension,
                                 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);
 
   // Notifies that the current set of page actions for |web_contents| has
   // changed, and signals the browser to update.
   void NotifyPageActionsChanged(content::WebContents* web_contents);
 
   void set_prefs_for_testing(ExtensionPrefs* prefs) {
     extension_prefs_ = prefs;
   }
 
  private:
   friend class BrowserContextKeyedAPIFactory<ExtensionActionAPI>;
 
   // Returns the associated extension prefs.
   ExtensionPrefs* GetExtensionPrefs();
 
   // The DispatchEvent methods forward events to the |context|'s event router.
   void DispatchEventToExtension(content::BrowserContext* context,
                                 const std::string& extension_id,
                                 events::HistogramValue histogram_value,
                                 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"; }
   static const bool kServiceRedirectedInIncognito = true;
 
   base::ObserverList<Observer> observers_;
 
   content::BrowserContext* browser_context_;
 
   ExtensionPrefs* extension_prefs_;
@@ skipping 308 matching lines @@
 class PageActionGetPopupFunction
     : public extensions::ExtensionActionGetPopupFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("pageAction.getPopup", PAGEACTION_GETPOPUP)
 
  protected:
   ~PageActionGetPopupFunction() override {}
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_ACTION_API_H_