Fully merge the implementations of the browserAction and pageAction APIs

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

Index: chrome/browser/extensions/api/extension_action/extension_page_actions_api.h
diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.h b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.h
index 899f395b309be78e10adb8d6d8bc31393967543f..d75380d074abfcdacee470ce3aef3d2651cacbbd 100644
--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.h
@@ -9,18 +9,6 @@
 #include "chrome/browser/extensions/api/extension_action/extension_actions_api.h"
 #include "chrome/browser/extensions/extension_function.h"
 
-class TabContentsWrapper;
-
-// Base class for page action APIs.
-class PageActionFunction : public ExtensionActionFunction {
- protected:
-  virtual ~PageActionFunction() {}
-  bool SetVisible(bool visible);
-  virtual bool RunImpl() OVERRIDE;
-
-  TabContentsWrapper* contents_;
-};
-
 // Base class for deprecated page actions APIs
 class PageActionsFunction : public SyncExtensionFunction {
  protected:
@@ -43,88 +31,43 @@ class DisablePageActionsFunction : public PageActionsFunction {
   DECLARE_EXTENSION_FUNCTION_NAME("pageActions.disableForTab")
 };
 
-// Implement chrome.pageAction.show().
-class PageActionShowFunction : public PageActionFunction {
+//
+// pageAction.* aliases for supported extensionActions APIs.
+//
+
+class PageActionShowFunction : public ExtensionActionShowFunction {
   virtual ~PageActionShowFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.show")
 };
 
-// Implement chrome.pageAction.hide().
-class PageActionHideFunction : public PageActionFunction {
+class PageActionHideFunction : public ExtensionActionHideFunction {
   virtual ~PageActionHideFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.hide")
 };
 
-// Implement chrome.pageAction.setIcon().
-class PageActionSetIconFunction : public PageActionFunction {
+class PageActionSetIconFunction : public ExtensionActionSetIconFunction {
   virtual ~PageActionSetIconFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setIcon")
 };
 
-// Implement chrome.pageAction.setTitle().
-class PageActionSetTitleFunction : public PageActionFunction {
+class PageActionSetTitleFunction : public ExtensionActionSetTitleFunction {
   virtual ~PageActionSetTitleFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setTitle")
 };
 
-// Implement chrome.pageAction.setPopup().
-class PageActionSetPopupFunction : public PageActionFunction {
+class PageActionSetPopupFunction : public ExtensionActionSetPopupFunction {
   virtual ~PageActionSetPopupFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setPopup")
 };
 
-// Implement chrome.pageAction.setBadgeBackgroundColor().
-class PageActionSetBadgeBackgroundColorFunction : public PageActionFunction {
-  virtual ~PageActionSetBadgeBackgroundColorFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeBackgroundColor")
-};
-
-// Implement chrome.pageAction.setBadgeTextColor().
-class PageActionSetBadgeTextColorFunction : public PageActionFunction {
-  virtual ~PageActionSetBadgeTextColorFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeTextColor")
-};
-
-// Implement chrome.pageActions.setBadgeText().
-class PageActionSetBadgeTextFunction : public PageActionFunction {
-  virtual ~PageActionSetBadgeTextFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeText")
-};
-
-// Implement chrome.pageAction.getTitle().
-class PageActionGetTitleFunction : public PageActionFunction {
+class PageActionGetTitleFunction : public ExtensionActionGetTitleFunction {
   virtual ~PageActionGetTitleFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.getTitle")
 };
 
-// Implement chrome.pageAction.getPopup().
-class PageActionGetPopupFunction : public PageActionFunction {
+class PageActionGetPopupFunction : public ExtensionActionGetPopupFunction {
   virtual ~PageActionGetPopupFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.getPopup")
 };
 
-// Implement chrome.pageAction.getBadgeText().
-class PageActionGetBadgeTextFunction : public PageActionFunction {
-  virtual ~PageActionGetBadgeTextFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("pageAction.getBadgeText")
-};
-
-// Implement chrome.pageAction.getBadgeBackgroundColor().
-class PageActionGetBadgeBackgroundColorFunction : public PageActionFunction {
-  virtual ~PageActionGetBadgeBackgroundColorFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("pageAction.getBadgeBackgroundColor")
-};
-
 #endif  // CHROME_BROWSER_EXTENSIONS_API_EXTENSION_ACTION_EXTENSION_PAGE_ACTIONS_API_H_