Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI

chrome/browser/extensions/extension_function_registry.cc

Index: chrome/browser/extensions/extension_function_registry.cc
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index 976382ba1cad16c72cb402b10194e62b2e15c18f..f2ad72a905ab80ad8a8fa70ad10ee42d98a7a6b6 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -16,9 +16,7 @@
 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 #include "chrome/browser/extensions/api/declarative/declarative_api.h"
-#include "chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h"
-#include "chrome/browser/extensions/api/extension_action/extension_page_actions_api.h"
-#include "chrome/browser/extensions/api/extension_action/script_badge_api.h"
+#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
 #include "chrome/browser/extensions/api/history/history_api.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
@@ -115,28 +113,28 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<UpdateTabFunction>();
 
   // Page Actions.
-  RegisterFunction<EnablePageActionsFunction>();
-  RegisterFunction<DisablePageActionsFunction>();
-  RegisterFunction<PageActionShowFunction>();
-  RegisterFunction<PageActionHideFunction>();
-  RegisterFunction<PageActionSetIconFunction>();
-  RegisterFunction<PageActionSetTitleFunction>();
-  RegisterFunction<PageActionSetPopupFunction>();
-  RegisterFunction<PageActionGetTitleFunction>();
-  RegisterFunction<PageActionGetPopupFunction>();
+  RegisterFunction<extensions::EnablePageActionFunction>();

[Yoyo Zhou, 2012/12/19 23:30:52]

Leave these names as they were before - they're in the weird pageActions
namespace - so we don't forget that they are misfits.

[Devlin, 2012/12/20 19:43:20]

Done.

+  RegisterFunction<extensions::DisablePageActionFunction>();
+  RegisterFunction<extensions::PageActionShowFunction>();
+  RegisterFunction<extensions::PageActionHideFunction>();
+  RegisterFunction<extensions::PageActionSetIconFunction>();
+  RegisterFunction<extensions::PageActionSetTitleFunction>();
+  RegisterFunction<extensions::PageActionSetPopupFunction>();
+  RegisterFunction<extensions::PageActionGetTitleFunction>();
+  RegisterFunction<extensions::PageActionGetPopupFunction>();
 
   // Browser Actions.
-  RegisterFunction<BrowserActionSetIconFunction>();
-  RegisterFunction<BrowserActionSetTitleFunction>();
-  RegisterFunction<BrowserActionSetBadgeTextFunction>();
-  RegisterFunction<BrowserActionSetBadgeBackgroundColorFunction>();
-  RegisterFunction<BrowserActionSetPopupFunction>();
-  RegisterFunction<BrowserActionGetTitleFunction>();
-  RegisterFunction<BrowserActionGetBadgeTextFunction>();
-  RegisterFunction<BrowserActionGetBadgeBackgroundColorFunction>();
-  RegisterFunction<BrowserActionGetPopupFunction>();
-  RegisterFunction<BrowserActionEnableFunction>();
-  RegisterFunction<BrowserActionDisableFunction>();
+  RegisterFunction<extensions::BrowserActionSetIconFunction>();
+  RegisterFunction<extensions::BrowserActionSetTitleFunction>();
+  RegisterFunction<extensions::BrowserActionSetBadgeTextFunction>();
+  RegisterFunction<extensions::BrowserActionSetBadgeBackgroundColorFunction>();
+  RegisterFunction<extensions::BrowserActionSetPopupFunction>();
+  RegisterFunction<extensions::BrowserActionGetTitleFunction>();
+  RegisterFunction<extensions::BrowserActionGetBadgeTextFunction>();
+  RegisterFunction<extensions::BrowserActionGetBadgeBackgroundColorFunction>();
+  RegisterFunction<extensions::BrowserActionGetPopupFunction>();
+  RegisterFunction<extensions::BrowserActionEnableFunction>();
+  RegisterFunction<extensions::BrowserActionDisableFunction>();
 
   // Script Badges.
   RegisterFunction<extensions::ScriptBadgeGetAttentionFunction>();