diff options
| author | dvh@chromium.org <dvh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 22:58:36 +0000 |
|---|---|---|
| committer | dvh@chromium.org <dvh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 22:58:36 +0000 |
| commit | d32c02a827060c757864e8053228886dd4910c61 (patch) | |
| tree | 69faddda9ee5548039e907e8c9706f6b110f7888 | |
| parent | 0fc58ae414f3cef03413965be981b21a07eec0c1 (diff) | |
| download | chromium_src-d32c02a827060c757864e8053228886dd4910c61.zip chromium_src-d32c02a827060c757864e8053228886dd4910c61.tar.gz chromium_src-d32c02a827060c757864e8053228886dd4910c61.tar.bz2 | |
Fixed crash when reloading unpacked apps/extensions.
- Allow reload of disabled extensions.
- In case the path of the extension is not found, do nothing.
BUG=382410
Review URL: https://codereview.chromium.org/336903004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277561 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index d9a5370..f7450f3 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -649,6 +649,11 @@ void ExtensionService::ReloadExtension( DisableExtension(extension_id, Extension::DISABLE_RELOAD); reloading_extensions_.insert(extension_id); } else { + std::map<std::string, base::FilePath>::const_iterator iter = + unloaded_extension_paths_.find(extension_id); + if (iter == unloaded_extension_paths_.end()) { + return; + } path = unloaded_extension_paths_[extension_id]; } |