Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no crashy 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
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 8e2d7b9d8bf17459b615d41c02c44c80915c58fd..d87c18e412a2a82f5e684a961405634846303996 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -18,6 +18,8 @@
#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"
@@ -578,9 +580,9 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
}
void ProfileManager::DoFinalInitForServices(Profile* profile,
- bool go_off_the_record) {
+ bool go_off_the_record) {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- profile->InitExtensions(!go_off_the_record);
+ ExtensionSystemFactory::GetForProfile(profile)->Init(!go_off_the_record);
if (!command_line.HasSwitch(switches::kDisableWebResources))
profile->InitPromoResources();
}

Powered by Google App Engine
This is Rietveld 408576698