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/extensions/api/app/app_api.h"
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 #include "chrome/browser/extensions/api/commands/commands.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/extension_action_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/metrics/metrics.h"
 #include "chrome/browser/extensions/api/module/module.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/api/top_sites/top_sites_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
@@ skipping 40 matching lines @@
   RegisterFunction<DisablePageActionsFunction>();
   RegisterFunction<PageActionShowFunction>();
   RegisterFunction<PageActionHideFunction>();
   RegisterFunction<PageActionSetIconFunction>();
   RegisterFunction<PageActionSetTitleFunction>();
   RegisterFunction<PageActionSetPopupFunction>();
   RegisterFunction<PageActionGetTitleFunction>();
   RegisterFunction<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>();
 
   // Browsing Data.
   RegisterFunction<RemoveBrowsingDataFunction>();
   RegisterFunction<RemoveAppCacheFunction>();
   RegisterFunction<RemoveCacheFunction>();
   RegisterFunction<RemoveCookiesFunction>();
   RegisterFunction<RemoveDownloadsFunction>();
   RegisterFunction<RemoveFileSystemsFunction>();
   RegisterFunction<RemoveFormDataFunction>();
   RegisterFunction<RemoveHistoryFunction>();
@@ skipping 195 matching lines @@
 
 ExtensionFunctionRegistry::FactoryEntry::FactoryEntry()
     : factory_(0), histogram_value_(extensions::functions::UNKNOWN) {
 }
 
 ExtensionFunctionRegistry::FactoryEntry::FactoryEntry(
     ExtensionFunctionFactory factory,
     extensions::functions::HistogramValue histogram_value)
     : factory_(factory), histogram_value_(histogram_value) {
 }