summaryrefslogtreecommitdiffstats
path: root/extensions/common/manifest_handlers
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2016-01-05 14:14:32 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-05 22:16:20 +0000
commit612db46613451f3c0d2ab5a3b0be373f6550d968 (patch)
tree3c3df137187698332ca1c2e1f02e490be928de54 /extensions/common/manifest_handlers
parentd71ea5987a457e8d08b9d722c3022d47c965159f (diff)
downloadchromium_src-612db46613451f3c0d2ab5a3b0be373f6550d968.zip
chromium_src-612db46613451f3c0d2ab5a3b0be373f6550d968.tar.gz
chromium_src-612db46613451f3c0d2ab5a3b0be373f6550d968.tar.bz2
Manual revert of "Change extension icon load errors to warnings"
This salvages a couple minor changes (tests, mostly), but is largely a revert of 6e8e7d1c49657e82d0e8f25 BUG=570249 Review URL: https://codereview.chromium.org/1552323002 Cr-Commit-Position: refs/heads/master@{#367667}
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 52597e5..20ad025 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(
- extension, icons_dict, &icons_info->icons, error)) {
+ icons_dict, &icons_info->icons, error)) {
return false;
}