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

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: rerebase 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 5dd29a2e2ca5fef4173c9f5719b0af70d9e9e05c..33d18a49d4fb1f7d90c1156e450d9ac68a97cb94 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"
@@ -609,9 +611,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();
}
« 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 »

Powered by Google App Engine
This is Rietveld 408576698