chrome/common/extensions/api/extension_action/action_info.cc - Issue 1547413002: Reland of Change extension icon load errors to warnings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/api/extension_action/action_info.cc

Issue 1547413002: Reland of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « chrome/common/extensions/api/extension_action/action_info.h ('k') | chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc » ('j') | extensions/common/file_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/action_info.cc

diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc

index 9185d132f2474366e4c7fc9b61c8f94085597b56..8e68d32e4ea12007666e002d59ac742f2e504b94 100644

--- a/chrome/common/extensions/api/extension_action/action_info.cc

+++ b/chrome/common/extensions/api/extension_action/action_info.cc

@@ -52,7 +52,7 @@

}

// static

-scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,

+scoped_ptr<ActionInfo> ActionInfo::Load(Extension* extension,

const base::DictionaryValue* dict,

base::string16* error) {

scoped_ptr<ActionInfo> result(new ActionInfo());

@@ -92,7 +92,7 @@

std::string default_icon;

if (dict->GetDictionary(keys::kPageActionDefaultIcon, &icons_value)) {

if (!manifest_handler_helpers::LoadIconsFromDictionary(

- icons_value, &result->default_icon, error)) {

+ extension, icons_value, &result->default_icon, error)) {

return scoped_ptr<ActionInfo>();

}

} else if (dict->GetString(keys::kPageActionDefaultIcon, &default_icon) &&