chrome/browser/extensions/browser_context_keyed_service_factories.cc - Issue 1241063003: Support Component Actions in the toolbar.

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/browser_context_keyed_service_factories.cc

Issue 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per mfoltz@'s comments. Created 5 years, 4 months 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

« no previous file with comments | « chrome/browser/extensions/api/extension_action/extension_action_api.cc ('k') | chrome/browser/extensions/extension_action_test_util.h » ('j') | chrome/browser/extensions/extension_action_test_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc

diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc

index b2cfdf89f1c19d0fd5e485d850e7751c5932a4d4..1adc9976d72ace8bd31c7f8fa94066cb0d424af5 100644

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

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

@@ -46,7 +46,6 @@

#include "chrome/browser/extensions/extension_gcm_app_handler.h"

#include "chrome/browser/extensions/extension_storage_monitor_factory.h"

#include "chrome/browser/extensions/extension_system_factory.h"

-#include "chrome/browser/extensions/extension_toolbar_model_factory.h"

#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"

#include "chrome/browser/extensions/install_tracker_factory.h"

#include "chrome/browser/extensions/install_verifier_factory.h"

@@ -55,6 +54,7 @@

#include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"

#include "chrome/browser/extensions/warning_badge_service_factory.h"

#include "chrome/browser/speech/extension_api/tts_extension_api.h"

+#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"

@@ -88,7 +88,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {

extensions::ExtensionGarbageCollectorFactory::GetInstance();

extensions::ExtensionStorageMonitorFactory::GetInstance();

extensions::ExtensionSystemFactory::GetInstance();

- extensions::ExtensionToolbarModelFactory::GetInstance();

extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();

extensions::FeedbackPrivateAPI::GetFactoryInstance();

extensions::FontSettingsAPI::GetFactoryInstance();

@@ -139,6 +138,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {

file_manager::EventRouterFactory::GetInstance();

#endif

TokenCacheServiceFactory::GetInstance();

+ ToolbarActionsModelFactory::GetInstance();

extensions::ExtensionGCMAppHandler::GetFactoryInstance();

}