Index: chrome/browser/extensions/extension_service.cc |
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
index b5b7ae9f2abba597de3beb72a565ba886c4efee7..d89d9916304958ade80fc13aac0fa153efd2a31a 100644 |
--- a/chrome/browser/extensions/extension_service.cc |
+++ b/chrome/browser/extensions/extension_service.cc |
@@ -216,6 +216,7 @@ ExtensionService::NaClModuleInfo::~NaClModuleInfo() { |
const char* ExtensionService::kInstallDirectoryName = "Extensions"; |
const char* ExtensionService::kCurrentVersionFileName = "Current Version"; |
+const char* ExtensionService::kSettingsDirectoryName = "Extension Settings"; |
// Implements IO for the ExtensionService. |
@@ -539,12 +540,14 @@ ExtensionService::ExtensionService(Profile* profile, |
const CommandLine* command_line, |
const FilePath& install_directory, |
ExtensionPrefs* extension_prefs, |
+ ExtensionSettings* extension_settings, |
bool autoupdate_enabled, |
bool extensions_enabled) |
: weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
profile_(profile), |
extension_prefs_(extension_prefs), |
+ extension_settings_(extension_settings), |
pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
install_directory_(install_directory), |
extensions_enabled_(extensions_enabled), |
@@ -1466,6 +1469,10 @@ ExtensionPrefs* ExtensionService::extension_prefs() { |
return extension_prefs_; |
} |
+ExtensionSettings* ExtensionService::extension_settings() { |
+ return extension_settings_; |
+} |
+ |
ExtensionContentSettingsStore* |
ExtensionService::GetExtensionContentSettingsStore() { |
return extension_prefs()->content_settings_store(); |