chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc - Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi.

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_page_actions_api.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: minor cleanup Created 8 years, 4 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/extension_actions_api.cc ('k') | chrome/browser/extensions/api/extension_action/page_action_apitest.cc » ('j') | ui/gfx/image/image_skia_operations.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index eff7b16302a4dd324f1e3e58ddbd2e124abf38f9..98cf442035d744b5a357d3ee9bfa63e5ea094877 100644

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

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

@@ -70,8 +70,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {

return false;

}

- if (icon_id < 0 ||

- static_cast<size_t>(icon_id) >= page_action->icon_paths()->size()) {

+ if (!page_action->IsValidIconIndex(icon_id)) {

error_ = (icon_id == 0) ? kNoIconSpecified : kIconIndexOutOfBounds;

return false;

}