chrome/browser/profiles/profile_io_data.cc - Issue 9583036: Revert 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/profiles/profile_io_data.cc

Issue 9583036: Revert 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, 10 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

Index: chrome/browser/profiles/profile_io_data.cc

===================================================================

--- chrome/browser/profiles/profile_io_data.cc (revision 124830)

+++ chrome/browser/profiles/profile_io_data.cc (working copy)

@@ -23,8 +23,6 @@

#include "chrome/browser/download/download_service_factory.h"

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

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

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

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

#include "chrome/browser/io_thread.h"

#include "chrome/browser/media/media_internals.h"

#include "chrome/browser/net/chrome_cookie_notification_details.h"

@@ -224,8 +222,7 @@

profile);

params->cookie_monster_delegate =

new ChromeCookieMonsterDelegate(profile_getter);

- params->extension_info_map =

- ExtensionSystemFactory::GetForProfile(profile)->info_map();

+ params->extension_info_map = profile->GetExtensionInfoMap();

#if defined(ENABLE_NOTIFICATIONS)

params->notification_service =

« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »