chrome/browser/profiles/profile_manager.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_manager.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_manager.cc

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

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

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

@@ -18,8 +18,6 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/extensions/default_apps_trial.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/prefs/pref_service.h"

#include "chrome/browser/prefs/scoped_user_pref_update.h"

#include "chrome/browser/profiles/profile_info_cache.h"

@@ -611,9 +609,9 @@

}

void ProfileManager::DoFinalInitForServices(Profile* profile,

- bool go_off_the_record) {

+ bool go_off_the_record) {

const CommandLine& command_line = *CommandLine::ForCurrentProcess();

- ExtensionSystemFactory::GetForProfile(profile)->Init(!go_off_the_record);

+ profile->InitExtensions(!go_off_the_record);

if (!command_line.HasSwitch(switches::kDisableWebResources))

profile->InitPromoResources();

}

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