summaryrefslogtreecommitdiffstats
path: root/extensions/utility/unpacker.cc
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2015-12-29 09:40:09 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-29 17:41:47 +0000
commit36dab10ffd04f3e38285bda1e4af07a7de081a31 (patch)
tree80868221607941234af986bf9a48305f59b70f4a /extensions/utility/unpacker.cc
parent4523757a627c8519d57da32c80c7643f3b1a4cc2 (diff)
downloadchromium_src-36dab10ffd04f3e38285bda1e4af07a7de081a31.zip
chromium_src-36dab10ffd04f3e38285bda1e4af07a7de081a31.tar.gz
chromium_src-36dab10ffd04f3e38285bda1e4af07a7de081a31.tar.bz2
Revert of Change extension icon load errors to warnings (patchset #8 id:140001 of https://codereview.chromium.org/1537473003/ )
Reason for revert: file read from wrong thread Original issue's description: > 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 > > Committed: https://crrev.com/6e8e7d1c49657e82d0e8f2518ad463794346321b > Cr-Commit-Position: refs/heads/master@{#366253} TBR=rdevlin.cronin@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=570249 Review URL: https://codereview.chromium.org/1554583002 Cr-Commit-Position: refs/heads/master@{#367080}
Diffstat (limited to 'extensions/utility/unpacker.cc')
-rw-r--r--extensions/utility/unpacker.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc
index be0a4b5..c230f82 100644
--- a/extensions/utility/unpacker.cc
+++ b/extensions/utility/unpacker.cc
@@ -187,8 +187,9 @@ bool Unpacker::Run() {
// Decode any images that the browser needs to display.
std::set<base::FilePath> image_paths =
ExtensionsClient::Get()->GetBrowserImagePaths(extension.get());
- for (const base::FilePath& path : image_paths) {
- if (!AddDecodedImage(path))
+ for (std::set<base::FilePath>::iterator it = image_paths.begin();
+ it != image_paths.end(); ++it) {
+ if (!AddDecodedImage(*it))
return false; // Error was already reported.
}