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

Side by Side Diff: extensions/common/manifest_handlers/icons_handler.cc

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
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 #include "extensions/common/manifest_handlers/icons_handler.h" 5 #include "extensions/common/manifest_handlers/icons_handler.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 bool IconsHandler::Parse(Extension* extension, base::string16* error) { 58 bool IconsHandler::Parse(Extension* extension, base::string16* error) {
59 scoped_ptr<IconsInfo> icons_info(new IconsInfo); 59 scoped_ptr<IconsInfo> icons_info(new IconsInfo);
60 const base::DictionaryValue* icons_dict = NULL; 60 const base::DictionaryValue* icons_dict = NULL;
61 if (!extension->manifest()->GetDictionary(keys::kIcons, &icons_dict)) { 61 if (!extension->manifest()->GetDictionary(keys::kIcons, &icons_dict)) {
62 *error = base::ASCIIToUTF16(manifest_errors::kInvalidIcons); 62 *error = base::ASCIIToUTF16(manifest_errors::kInvalidIcons);
63 return false; 63 return false;
64 } 64 }
65 65
66 if (!manifest_handler_helpers::LoadIconsFromDictionary( 66 if (!manifest_handler_helpers::LoadIconsFromDictionary(
67 extension, icons_dict, &icons_info->icons, error)) { 67 icons_dict, &icons_info->icons, error)) {
68 return false; 68 return false;
69 } 69 }
70 70
71 extension->SetManifestData(keys::kIcons, icons_info.release()); 71 extension->SetManifestData(keys::kIcons, icons_info.release());
72 return true; 72 return true;
73 } 73 }
74 74
75 bool IconsHandler::Validate(const Extension* extension, 75 bool IconsHandler::Validate(const Extension* extension,
76 std::string* error, 76 std::string* error,
77 std::vector<InstallWarning>* warnings) const { 77 std::vector<InstallWarning>* warnings) const {
78 return file_util::ValidateExtensionIconSet(IconsInfo::GetIcons(extension), 78 return file_util::ValidateExtensionIconSet(IconsInfo::GetIcons(extension),
79 extension, 79 extension,
80 IDS_EXTENSION_LOAD_ICON_FAILED, 80 IDS_EXTENSION_LOAD_ICON_FAILED,
81 error); 81 error);
82 } 82 }
83 83
84 const std::vector<std::string> IconsHandler::Keys() const { 84 const std::vector<std::string> IconsHandler::Keys() const {
85 return SingleKey(keys::kIcons); 85 return SingleKey(keys::kIcons);
86 } 86 }
87 87
88 } // namespace extensions 88 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/manifest_handler_helpers.cc ('k') | extensions/test/data/file_util/bad_icon/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698