chrome/browser/extensions/extension_function_registry.cc - Issue 11638022: Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI

Unified Diff: chrome/browser/extensions/extension_function_registry.cc

Issue 11638022: Consolidate [BrowserAction,PageAction,ScriptBadge]API into ExtensionActionAPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_script_badge

Patch Set: nits Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/browser_event_router.cc ('K') | « chrome/browser/extensions/browser_event_router.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7bdcea531f8e9168fdcfa0995d6d02860656d604..72511602528f9a567c07b4d41c325d41d81de17e 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"

@@ -126,17 +124,17 @@ void ExtensionFunctionRegistry::ResetFunctions() {

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>();

// Script Badges.

RegisterFunction<extensions::ScriptBadgeGetAttentionFunction>();