diff options
| author | estade <estade@chromium.org> | 2015-12-29 09:51:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-29 17:52:08 +0000 |
| commit | 82eaf58a99fb2cfd7c482ee301d57e00508a903a (patch) | |
| tree | a3fcdb0b432720a1d32b8ae71202f97c65c69ba1 /extensions/utility | |
| parent | 36dab10ffd04f3e38285bda1e4af07a7de081a31 (diff) | |
| download | chromium_src-82eaf58a99fb2cfd7c482ee301d57e00508a903a.zip chromium_src-82eaf58a99fb2cfd7c482ee301d57e00508a903a.tar.gz chromium_src-82eaf58a99fb2cfd7c482ee301d57e00508a903a.tar.bz2 | |
Reland of Change extension icon load errors to warnings (patchset #2 id:300001 of https://codereview.chromium.org/1554583002/ )
Reason for revert:
this revert managed to break the tree
Original issue's description:
> 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
>
> Committed: https://crrev.com/36dab10ffd04f3e38285bda1e4af07a7de081a31
> Cr-Commit-Position: refs/heads/master@{#367080}
TBR=rdevlin.cronin@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=570249
Review URL: https://codereview.chromium.org/1547413002
Cr-Commit-Position: refs/heads/master@{#367081}
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 c230f82..be0a4b5 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -187,9 +187,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. } |