Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Unified Diff: extensions/common/manifest_handler_helpers.h

Issue 1554583002: Revert of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge issues Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/file_util_unittest.cc ('k') | extensions/common/manifest_handler_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/manifest_handler_helpers.h
diff --git a/extensions/common/manifest_handler_helpers.h b/extensions/common/manifest_handler_helpers.h
index e1f901a7fa15a7decc5db2156239def84bc78c90..b0249c30c96e51e91b95e770b53ee4e3d0795891 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);
« no previous file with comments | « extensions/common/file_util_unittest.cc ('k') | extensions/common/manifest_handler_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698