chrome/browser/extensions/extension_function_registry.cc - Issue 11588004: Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11588004: Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Yoyo's requested changes 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/api/extension_action/script_badge_api_factory.h ('K') | « chrome/browser/extensions/extension_action_unittest.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')
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 2dd60242935239e258c70b7363d57e9222edfefc..976382ba1cad16c72cb402b10194e62b2e15c18f 100644

--- a/chrome/browser/extensions/extension_function_registry.cc

+++ b/chrome/browser/extensions/extension_function_registry.cc

@@ -18,7 +18,7 @@

#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/extension_script_badge_api.h"

+#include "chrome/browser/extensions/api/extension_action/script_badge_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"

@@ -139,9 +139,9 @@ void ExtensionFunctionRegistry::ResetFunctions() {

RegisterFunction<BrowserActionDisableFunction>();

// Script Badges.

- RegisterFunction<ScriptBadgeGetAttentionFunction>();

- RegisterFunction<ScriptBadgeGetPopupFunction>();

- RegisterFunction<ScriptBadgeSetPopupFunction>();

+ RegisterFunction<extensions::ScriptBadgeGetAttentionFunction>();

+ RegisterFunction<extensions::ScriptBadgeGetPopupFunction>();

+ RegisterFunction<extensions::ScriptBadgeSetPopupFunction>();

// Browsing Data.

RegisterFunction<RemoveBrowsingDataFunction>();