diff options
| author | estade <estade@chromium.org> | 2015-12-18 18:39:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-19 02:40:36 +0000 |
| commit | 6e8e7d1c49657e82d0e8f2518ad463794346321b (patch) | |
| tree | 516b2ba9491ad1c0097dcb766b411bb82a809641 /extensions/utility | |
| parent | f45be477c7c9913086ac2ba256dfeafac6fcc45a (diff) | |
| download | chromium_src-6e8e7d1c49657e82d0e8f2518ad463794346321b.zip chromium_src-6e8e7d1c49657e82d0e8f2518ad463794346321b.tar.gz chromium_src-6e8e7d1c49657e82d0e8f2518ad463794346321b.tar.bz2 | |
Change extension icon load errors to warnings
During the Extension parsing step, check if the icon file exists and if not, remove that entry from the dictionary.
Keep the same check during the validation phase and don't apply the workaround to unpacked extensions. This will more strongly discourage new extensions from making this mistake.
BUG=570249
Review URL: https://codereview.chromium.org/1537473003
Cr-Commit-Position: refs/heads/master@{#366253}
Diffstat (limited to 'extensions/utility')
| -rw-r--r-- | extensions/utility/unpacker.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index 36c0eba..4763268 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -185,9 +185,8 @@ bool Unpacker::Run() { // Decode any images that the browser needs to display. std::set<base::FilePath> image_paths = ExtensionsClient::Get()->GetBrowserImagePaths(extension.get()); - for (std::set<base::FilePath>::iterator it = image_paths.begin(); - it != image_paths.end(); ++it) { - if (!AddDecodedImage(*it)) + for (const base::FilePath& path : image_paths) { + if (!AddDecodedImage(path)) return false; // Error was already reported. } |