diff options
Diffstat (limited to 'chrome/browser/extensions/extension_prefs.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_prefs.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 388172d..10c5056 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -96,6 +96,12 @@ void ExtensionPrefs::MakePathsRelative() { DictionaryValue* extension_dict; if (!dict->GetDictionaryWithoutPathExpansion(*i, &extension_dict)) continue; + int location_value; + if (extension_dict->GetInteger(kPrefLocation, &location_value) && + location_value == Extension::LOAD) { + // Unpacked extensions can have absolute paths. + continue; + } FilePath::StringType path_string; if (!extension_dict->GetString(kPrefPath, &path_string)) continue; @@ -120,6 +126,12 @@ void ExtensionPrefs::MakePathsAbsolute(DictionaryValue* dict) { NOTREACHED(); continue; } + int location_value; + if (extension_dict->GetInteger(kPrefLocation, &location_value) && + location_value == Extension::LOAD) { + // Unpacked extensions will already have absolute paths. + continue; + } FilePath::StringType path_string; if (!extension_dict->GetString(kPrefPath, &path_string)) { if (!IsBlacklistBitSet(extension_dict)) { @@ -539,11 +551,12 @@ ExtensionPrefs::ExtensionsInfo* ExtensionPrefs::CollectExtensionsInfo( continue; } - // Only internal and external extensions can be installed permanently in the + // Only the following extension types can be installed permanently in the // preferences. Extension::Location location = static_cast<Extension::Location>(location_value); if (location != Extension::INTERNAL && + location != Extension::LOAD && !Extension::IsExternalLocation(location)) { NOTREACHED(); continue; |