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

Side by Side 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 4 years, 11 months 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_ 5 #ifndef EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_
6 #define EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_ 6 #define EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector>
10 9
11 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
13 #include "extensions/common/install_warning.h"
14 12
15 class ExtensionIconSet; 13 class ExtensionIconSet;
16 14
17 namespace base { 15 namespace base {
18 class DictionaryValue; 16 class DictionaryValue;
19 } 17 }
20 18
21 namespace extensions { 19 namespace extensions {
22
23 class Extension;
24
25 namespace manifest_handler_helpers { 20 namespace manifest_handler_helpers {
26 21
27 // Strips leading slashes from the file path. Returns true iff the final path is 22 // Strips leading slashes from the file path. Returns true iff the final path is
28 // non empty. 23 // non empty.
29 bool NormalizeAndValidatePath(std::string* path); 24 bool NormalizeAndValidatePath(std::string* path);
30 25
31 // Loads icon paths defined in dictionary |icons_value| into ExtensionIconSet 26 // Loads icon paths defined in dictionary |icons_value| into ExtensionIconSet
32 // |icons|. |icons_value| is a dictionary value {icon size -> icon path}. 27 // |icons|. |icons_value| is a dictionary value {icon size -> icon path}.
33 // Returns success. If load fails, |error| will be set. Non-failure warnings may 28 // Returns success. If load fails, |error| will be set.
34 // be added to |extension|. 29 bool LoadIconsFromDictionary(const base::DictionaryValue* icons_value,
35 bool LoadIconsFromDictionary(Extension* extension,
36 const base::DictionaryValue* icons_value,
37 ExtensionIconSet* icons, 30 ExtensionIconSet* icons,
38 base::string16* error); 31 base::string16* error);
39 32
40 } // namespace manifest_handler_helpers 33 } // namespace manifest_handler_helpers
41 } // namespace extensions 34 } // namespace extensions
42 35
43 #endif // EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_ 36 #endif // EXTENSIONS_COMMON_MANIFEST_HANDLER_HELPERS_H_
OLDNEW
« 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