summaryrefslogtreecommitdiffstats
path: root/extensions/common/manifest_handler_helpers.h
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/common/manifest_handler_helpers.h
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/common/manifest_handler_helpers.h')
-rw-r--r--extensions/common/manifest_handler_helpers.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/extensions/common/manifest_handler_helpers.h b/extensions/common/manifest_handler_helpers.h
index e1f901a..b0249c3 100644
--- a/extensions/common/manifest_handler_helpers.h
+++ b/extensions/common/manifest_handler_helpers.h
@@ -6,11 +6,9 @@
#define EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_
#include <string>
-#include <vector>
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
-#include "extensions/common/install_warning.h"
class ExtensionIconSet;
@@ -19,9 +17,6 @@ class DictionaryValue;
}
namespace extensions {
-
-class Extension;
-
namespace manifest_handler_helpers {
// Strips leading slashes from the file path. Returns true iff the final path is
@@ -30,10 +25,8 @@ bool NormalizeAndValidatePath(std::string* path);
// Loads icon paths defined in dictionary |icons_value| into ExtensionIconSet
// |icons|. |icons_value| is a dictionary value {icon size -> icon path}.
-// Returns success. If load fails, |error| will be set. Non-failure warnings may
-// be added to |extension|.
-bool LoadIconsFromDictionary(Extension* extension,
- const base::DictionaryValue* icons_value,
+// Returns success. If load fails, |error| will be set.
+bool LoadIconsFromDictionary(const base::DictionaryValue* icons_value,
ExtensionIconSet* icons,
base::string16* error);