| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| index d00eaf398903cd3c76e756ed18a279f54bc7010e..e184a4ff26b12e578c1175c5f67034e19c29fb14 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -864,12 +864,13 @@ void ExtensionSettingsHandler::AppInfoDialogClosed() {
|
| }
|
|
|
| void ExtensionSettingsHandler::ReloadUnpackedExtensions() {
|
| - const ExtensionSet* extensions = extension_service_->extensions();
|
| + ExtensionRegistry* registry =
|
| + ExtensionRegistry::Get(extension_service_->profile());
|
| std::vector<const Extension*> unpacked_extensions;
|
| - for (ExtensionSet::const_iterator extension = extensions->begin();
|
| - extension != extensions->end(); ++extension) {
|
| - if (Manifest::IsUnpackedLocation((*extension)->location()))
|
| - unpacked_extensions.push_back(extension->get());
|
| + for (const scoped_refptr<const extensions::Extension>& extension :
|
| + registry->enabled_extensions()) {
|
| + if (Manifest::IsUnpackedLocation(extension->location()))
|
| + unpacked_extensions.push_back(extension.get());
|
| }
|
|
|
| for (std::vector<const Extension*>::iterator iter =
|
| @@ -998,10 +999,11 @@ void ExtensionSettingsHandler::HandleInspectMessage(
|
|
|
| if (render_process_id == -1) {
|
| // This message is for a lazy background page. Start the page if necessary.
|
| + Profile* profile = Profile::FromWebUI(web_ui());
|
| const Extension* extension =
|
| - extension_service_->extensions()->GetByID(extension_id);
|
| + ExtensionRegistry::Get(profile)
|
| + ->GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
|
| DCHECK(extension);
|
| - Profile* profile = Profile::FromWebUI(web_ui());
|
| if (incognito)
|
| profile = profile->GetOffTheRecordProfile();
|
| devtools_util::InspectBackgroundPage(extension, profile);
|
|
|