summaryrefslogtreecommitdiffstats
path: root/extensions/common/manifest_handlers
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2015-12-18 18:39:37 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-19 02:40:36 +0000
commit6e8e7d1c49657e82d0e8f2518ad463794346321b (patch)
tree516b2ba9491ad1c0097dcb766b411bb82a809641 /extensions/common/manifest_handlers
parentf45be477c7c9913086ac2ba256dfeafac6fcc45a (diff)
downloadchromium_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/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;
}