chrome/browser/extensions/api/extension_action/extension_action_api.cc - Issue 1669163002: [Extensions] Allow extensions to set a rectangular icon for the extension action

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/browser/extensions/api/extension_action/extension_action_api.cc

Issue 1669163002: [Extensions] Allow extensions to set a rectangular icon for the extension action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

index 1af27cb18542297342f1d8844727de3d8da819b1..bb53890101893cfb1f3b402498e2d8fa8e01ab35 100644

--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

@@ -506,6 +506,11 @@ bool ExtensionActionSetIconFunction::RunExtensionAction() {

EXTENSION_FUNCTION_VALIDATE(

ExtensionAction::ParseIconFromCanvasDictionary(*canvas_set, &icon));

+ if (icon.isNull()) {

+ error_ = "Icon invalid.";

+ return false;

+ }

extension_action_->SetIcon(tab_id_, gfx::Image(icon));

} else if (details_->GetInteger("iconIndex", &icon_index)) {

// Obsolete argument: ignore it.