Fully merge the implementations of the browserAction and pageAction APIs

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

Index: chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h
diff --git a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h
index 1ead6912b44c037c96115c6d095c617dd784bc71..ed5ddf7d738f4a46ee69db0f8054d90a000c34d6 100644
--- a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h
@@ -10,76 +10,56 @@
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/extension_action.h"
 
-// Base class for chrome.browserAction.* APIs.
-class BrowserActionFunction : public ExtensionActionFunction {
- protected:
-  virtual ~BrowserActionFunction() {}
-  virtual bool RunImpl() OVERRIDE;
-  void FireUpdateNotification();
-};
+//
+// browserAction.* aliases for supported browserActions APIs.
+//
 
-// Implement chrome.browserAction.setIcon().
-class BrowserActionSetIconFunction : public BrowserActionFunction {
+class BrowserActionSetIconFunction : public ExtensionActionSetIconFunction {
   virtual ~BrowserActionSetIconFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setIcon")
 };
 
-// Implement chrome.browserAction.setTitle().
-class BrowserActionSetTitleFunction : public BrowserActionFunction {
+class BrowserActionSetTitleFunction : public ExtensionActionSetTitleFunction {
   virtual ~BrowserActionSetTitleFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setTitle")
 };
 
-// Implement chrome.browserAction.setPopup().
-class BrowserActionSetPopupFunction : public BrowserActionFunction {
+class BrowserActionSetPopupFunction : public ExtensionActionSetPopupFunction {
   virtual ~BrowserActionSetPopupFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setPopup")
 };
 
-// Implement chrome.browserAction.setBadgeText().
-class BrowserActionSetBadgeTextFunction : public BrowserActionFunction {
+class BrowserActionGetTitleFunction : public ExtensionActionGetTitleFunction {
+  virtual ~BrowserActionGetTitleFunction() {}
+  DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getTitle")
+};
+
+class BrowserActionGetPopupFunction : public ExtensionActionGetPopupFunction {
+  virtual ~BrowserActionGetPopupFunction() {}
+  DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getPopup")
+};
+
+class BrowserActionSetBadgeTextFunction
+    : public ExtensionActionSetBadgeTextFunction {
   virtual ~BrowserActionSetBadgeTextFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setBadgeText")
 };
 
-// Implement chrome.browserAction.setBadgeBackgroundColor().
 class BrowserActionSetBadgeBackgroundColorFunction
-    : public BrowserActionFunction {
+    : public ExtensionActionSetBadgeBackgroundColorFunction {
   virtual ~BrowserActionSetBadgeBackgroundColorFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setBadgeBackgroundColor")
 };
 
-// Implement chrome.browserAction.getTitle().
-class BrowserActionGetTitleFunction : public BrowserActionFunction {
-  virtual ~BrowserActionGetTitleFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getTitle")
-};
-
-// Implement chrome.browserAction.getPopup().
-class BrowserActionGetPopupFunction : public BrowserActionFunction {
-  virtual ~BrowserActionGetPopupFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
-  DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getPopup")
-};
-
-// Implement chrome.browserAction.getBadgeText().
-class BrowserActionGetBadgeTextFunction : public BrowserActionFunction {
+class BrowserActionGetBadgeTextFunction
+    : public ExtensionActionGetBadgeTextFunction {
   virtual ~BrowserActionGetBadgeTextFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getBadgeText")
 };
 
-// Implement chrome.browserAction.getBadgeBackgroundColor().
 class BrowserActionGetBadgeBackgroundColorFunction
-    : public BrowserActionFunction {
+    : public ExtensionActionGetBadgeBackgroundColorFunction {
   virtual ~BrowserActionGetBadgeBackgroundColorFunction() {}
-  virtual bool RunExtensionAction() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.getBadgeBackgroundColor")
 };