chrome/common/extensions/extension.h - 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/common/extensions/extension.h

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: rebase Created 8 years, 3 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

« chrome/browser/extensions/extension_action_icon_factory.cc ('K') | « chrome/chrome_tests.gypi ('k') | chrome/common/extensions/extension.cc » ('j') | chrome/common/extensions/extension.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension.h

diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h

index 5216471f2a5efda80ea1702b3cddf755c5082f2a..93842f3e1df1bc6185fa6491bb1ebcbbe6d1ee4b 100644

--- a/chrome/common/extensions/extension.h

+++ b/chrome/common/extensions/extension.h

@@ -617,8 +617,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {

return !omnibox_keyword().empty() ||

browser_action() ||

(page_action() &&

- (page_action_command() ||

- !page_action()->default_icon_path().empty()));

+ (page_action_command() || page_action()->default_icon()));

}

const FileBrowserHandlerList* file_browser_handlers() const {

return file_browser_handlers_.get();