chrome/browser/extensions/extension_event_router.cc - Issue 9609024: Reland 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

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_event_router.cc

Issue 9609024: Reland 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 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/extension_devtools_bridge.cc ('k') | chrome/browser/extensions/extension_function_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_event_router.cc

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

index 7d8a6c7a43074f3dce3b04d1f9221b93252d07dd..39a14d2d51a871448ae5c484de410edfeeee0d4a 100644

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

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

@@ -13,6 +13,8 @@

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

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

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

+#include "chrome/browser/extensions/extension_system.h"

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

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

#include "chrome/browser/extensions/api/webrequest/webrequest_api.h"

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

@@ -100,7 +102,8 @@ void ExtensionEventRouter::DispatchEvent(IPC::Message::Sender* ipc_sender,

ExtensionEventRouter::ExtensionEventRouter(Profile* profile)

: profile_(profile),

- extension_devtools_manager_(profile->GetExtensionDevToolsManager()) {

+ extension_devtools_manager_(

+ ExtensionSystemFactory::GetForProfile(profile)->devtools_manager()) {

registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,

content::NotificationService::AllSources());

registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,