Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index bc12846d363f45da8f093529c9eac0040bb26192..346672b29dba8ae03f42c75a7875ef7889e6d879 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -33,6 +33,7 @@ |
#include "chrome/browser/extensions/extension_pref_store.h" |
#include "chrome/browser/extensions/extension_process_manager.h" |
#include "chrome/browser/extensions/extension_service.h" |
+#include "chrome/browser/extensions/extension_settings.h" |
#include "chrome/browser/extensions/extension_special_storage_policy.h" |
#include "chrome/browser/extensions/user_script_master.h" |
#include "chrome/browser/favicon/favicon_service.h" |
@@ -462,6 +463,7 @@ void ProfileImpl::InitExtensions(bool extensions_enabled) { |
CommandLine::ForCurrentProcess(), |
GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), |
extension_prefs_.get(), |
+ extension_settings_.get(), |
autoupdate_enabled, |
extensions_enabled)); |
@@ -823,6 +825,9 @@ void ProfileImpl::OnPrefsLoaded(bool success) { |
GetPath().AppendASCII(ExtensionService::kInstallDirectoryName), |
GetExtensionPrefValueMap())); |
+ extension_settings_.reset(new ExtensionSettings( |
+ GetPath().AppendASCII(ExtensionService::kSettingsDirectoryName))); |
+ |
DCHECK(!net_pref_observer_.get()); |
net_pref_observer_.reset( |
new NetPrefObserver(prefs_.get(), GetPrerenderManager())); |