| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index a835f6a70886f0407638539606d0cc47866f14ad..4ea6c9d0d5eccb5679384a046d7a4c61bc844c79 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -209,6 +209,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.
|
|
|
| @@ -491,12 +492,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),
|
| @@ -1367,6 +1370,10 @@ ExtensionPrefs* ExtensionService::extension_prefs() {
|
| return extension_prefs_;
|
| }
|
|
|
| +ExtensionSettings* ExtensionService::extension_settings() {
|
| + return extension_settings_;
|
| +}
|
| +
|
| ExtensionContentSettingsStore*
|
| ExtensionService::GetExtensionContentSettingsStore() {
|
| return extension_prefs()->content_settings_store();
|
|
|