summaryrefslogtreecommitdiffstats
path: root/extensions/common/manifest_handlers
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2015-12-29 09:51:31 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-29 17:52:08 +0000
commit82eaf58a99fb2cfd7c482ee301d57e00508a903a (patch)
treea3fcdb0b432720a1d32b8ae71202f97c65c69ba1 /extensions/common/manifest_handlers
parent36dab10ffd04f3e38285bda1e4af07a7de081a31 (diff)
downloadchromium_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/common/manifest_handlers')
-rw-r--r--extensions/common/manifest_handlers/icons_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc
index 20ad025..52597e5 100644
--- a/extensions/common/manifest_handlers/icons_handler.cc
+++ b/extensions/common/manifest_handlers/icons_handler.cc
@@ -64,7 +64,7 @@ bool IconsHandler::Parse(Extension* extension, base::string16* error) {
}
if (!manifest_handler_helpers::LoadIconsFromDictionary(
- icons_dict, &icons_info->icons, error)) {
+ extension, icons_dict, &icons_info->icons, error)) {
return false;
}