Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI

chrome/browser/extensions/extension_function_registry.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_function_registry.h"
 
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/extensions/api/app/app_api.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 #include "chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h"
 #include "chrome/browser/extensions/api/commands/commands.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/api/context_menu/context_menu_api.h"
 #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"
 #include "chrome/browser/extensions/api/i18n/i18n_api.h"
 #include "chrome/browser/extensions/api/idle/idle_api.h"
 #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h"
 #include "chrome/browser/extensions/api/management/management_api.h"
 #include "chrome/browser/extensions/api/metrics/metrics.h"
 #include "chrome/browser/extensions/api/module/module.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
@@ skipping 76 matching lines @@
   RegisterFunction<HighlightTabsFunction>();
   RegisterFunction<MoveTabsFunction>();
   RegisterFunction<QueryTabsFunction>();
   RegisterFunction<ReloadTabFunction>();
   RegisterFunction<RemoveTabsFunction>();
   RegisterFunction<TabsExecuteScriptFunction>();
   RegisterFunction<TabsInsertCSSFunction>();
   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>();
   RegisterFunction<extensions::ScriptBadgeGetPopupFunction>();
   RegisterFunction<extensions::ScriptBadgeSetPopupFunction>();
 
   // Browsing Data.
   RegisterFunction<RemoveBrowsingDataFunction>();
   RegisterFunction<RemoveAppCacheFunction>();
   RegisterFunction<RemoveCacheFunction>();
@@ skipping 380 matching lines @@
 }
 
 ExtensionFunction* ExtensionFunctionRegistry::NewFunction(
     const std::string& name) {
   FactoryMap::iterator iter = factories_.find(name);
   DCHECK(iter != factories_.end());
   ExtensionFunction* function = iter->second();
   function->set_name(name);
   return function;
 }