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

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/profiles/profile_dependency_manager.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: 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/extension_function_registry.cc ('K') | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_dependency_manager.cc

diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc

index a1faf6faa823f1896398b1a3019be9647c350091..47b947f5c602a68885401a2faa03c1093cef9fb1 100644

--- a/chrome/browser/profiles/profile_dependency_manager.cc

+++ b/chrome/browser/profiles/profile_dependency_manager.cc

@@ -20,7 +20,7 @@

#include "chrome/browser/extensions/api/cookies/cookies_api_factory.h"

#include "chrome/browser/extensions/api/dial/dial_api_factory.h"

#include "chrome/browser/extensions/api/discovery/suggested_links_registry_factory.h"

-#include "chrome/browser/extensions/api/extension_action/script_badge_api_factory.h"

+#include "chrome/browser/extensions/api/extension_action/extension_action_api_factory.h"

#include "chrome/browser/extensions/api/font_settings/font_settings_api_factory.h"

#include "chrome/browser/extensions/api/history/history_api_factory.h"

#include "chrome/browser/extensions/api/idle/idle_manager_factory.h"

@@ -246,6 +246,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {

extensions::CommandServiceFactory::GetInstance();

extensions::CookiesAPIFactory::GetInstance();

extensions::DialAPIFactory::GetInstance();

+ extensions::ExtensionActionAPIFactory::GetInstance();

extensions::ExtensionSystemFactory::GetInstance();

extensions::FontSettingsAPIFactory::GetInstance();

extensions::HistoryAPIFactory::GetInstance();

@@ -260,7 +261,6 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {

extensions::PreferenceAPIFactory::GetInstance();

extensions::ProcessesAPIFactory::GetInstance();

extensions::PushMessagingAPIFactory::GetInstance();

- extensions::ScriptBadgeAPIFactory::GetInstance();

extensions::SuggestedLinksRegistryFactory::GetInstance();

extensions::TabCaptureRegistryFactory::GetInstance();

extensions::TabsWindowsAPIFactory::GetInstance();