| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index dc4d403fdcc1b66339a973c7eeefc9a547942a91..090f2ebf560a8d062bc7adbd83b902f02654e392 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -579,14 +579,12 @@ 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),
|
| @@ -634,6 +632,10 @@ ExtensionService::ExtensionService(Profile* profile,
|
| new ExtensionServiceBackend(weak_ptr_factory_.GetWeakPtr(),
|
| install_directory_);
|
|
|
| + extension_settings_.reset(
|
| + new ExtensionSettingsUIWrapper(
|
| + profile_->GetPath().AppendASCII(kSettingsDirectoryName)));
|
| +
|
| if (extensions_enabled_) {
|
| ExternalExtensionProviderImpl::CreateExternalProviders(
|
| this, profile_, &external_extension_providers_);
|
| @@ -1653,8 +1655,8 @@ ExtensionPrefs* ExtensionService::extension_prefs() {
|
| return extension_prefs_;
|
| }
|
|
|
| -ExtensionSettings* ExtensionService::extension_settings() {
|
| - return extension_settings_;
|
| +ExtensionSettingsUIWrapper* ExtensionService::extension_settings() {
|
| + return extension_settings_.get();
|
| }
|
|
|
| ExtensionContentSettingsStore*
|
|
|