Fully merge the implementations of the browserAction and pageAction APIs

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

Index: chrome/browser/extensions/api/extension_action/extension_actions_api.h
diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.h b/chrome/browser/extensions/api/extension_action/extension_actions_api.h
index dc3d53b008a5955e2e8ebaee8f09eedbf6ff5e47..42be69ed2e6b51d5b2a8a04555d9ba111f56713b 100644
--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.h
@@ -12,8 +12,14 @@
 namespace base {
 class DictionaryValue;
 }
+class TabContentsWrapper;
 
-// Base class for chrome.(browserAction|pageAction).* APIs.
+// Implementation of both the browserAction and pageAction APIs.
+//
+// Divergent behaviour between the two is minimal (pageAction has required
+// tabIds while browserAction's are optional, they have different internal
+// browser notification requirements, and not all functions are defined for
+// both APIs).
 class ExtensionActionFunction : public SyncExtensionFunction {
  public:
   static bool ParseCSSColorString(const std::string& color_string,
@@ -24,26 +30,110 @@ class ExtensionActionFunction : public SyncExtensionFunction {
   virtual ~ExtensionActionFunction();
   virtual bool RunImpl() OVERRIDE;
   virtual bool RunExtensionAction() = 0;
-  bool SetIcon();
-  bool SetTitle();
-  bool SetPopup();
-  bool SetBadgeBackgroundColor();
-  bool SetBadgeText();
-  bool GetTitle();
-  bool GetPopup();
-  bool GetBadgeBackgroundColor();
-  bool GetBadgeText();
-
-  // All the browser action APIs take a single argument called details that is
-  // a dictionary.
+  void NotifyChange();
+  void NotifyBrowserActionChange();
+  void NotifyPageActionChange();
+  bool SetVisible(bool visible);
+
+  // All the extension action APIs take a single argument called details that
+  // is a dictionary.
   base::DictionaryValue* details_;
 
   // The tab id the extension action function should apply to, if any, or
   // kDefaultTabId if none was specified.
   int tab_id_;
 
+  // Tab content for |tab_id_| if one exists.
+  TabContentsWrapper* contents_;
+
   // The extension action for the current extension.
   ExtensionAction* extension_action_;
 };
 
+//
+// Implementations of each extension action API.
+//
+// pageAction and browserAction bindings are created for these by extending them
+// then declaring an EXTENSION_FUNCTION_NAME.
+//
+
+// show
+class ExtensionActionShowFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionShowFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// hide
+class ExtensionActionHideFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionHideFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// setIcon
+class ExtensionActionSetIconFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionSetIconFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// setTitle
+class ExtensionActionSetTitleFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionSetTitleFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// setPopup
+class ExtensionActionSetPopupFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionSetPopupFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// setBadgeText
+class ExtensionActionSetBadgeTextFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionSetBadgeTextFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// setBadgeBackgroundColor
+class ExtensionActionSetBadgeBackgroundColorFunction
+    : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionSetBadgeBackgroundColorFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// getTitle
+class ExtensionActionGetTitleFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionGetTitleFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// getPopup
+class ExtensionActionGetPopupFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionGetPopupFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// getBadgeText
+class ExtensionActionGetBadgeTextFunction : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionGetBadgeTextFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
+// getBadgeBackgroundColor
+class ExtensionActionGetBadgeBackgroundColorFunction
+    : public ExtensionActionFunction {
+ protected:
+  virtual ~ExtensionActionGetBadgeBackgroundColorFunction() {}
+  virtual bool RunExtensionAction() OVERRIDE;
+};
+
 #endif  // CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_ACTIONS_API_H_