chrome/browser/ui/webui/extension_icon_source.cc - Issue 7553020: Revert 94715 - Revert 94714 - Improve layout for bookmark-apps. Add treatment for small icons.

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/ui/webui/extension_icon_source.cc

Issue 7553020: Revert 94715 - Revert 94714 - Improve layout for bookmark-apps. Add treatment for small icons. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebase to head. Created 9 years, 5 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/resources/ntp4/apps_page.js ('K') | « chrome/browser/ui/webui/extension_icon_source.h ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extension_icon_source.cc

diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc

index 78c7b27b8f8889f3e86cccd4b6de25549d54f9bf..6a52ba6540d1c06e025e6466d92c9f8cf2a823cd 100644

--- a/chrome/browser/ui/webui/extension_icon_source.cc

+++ b/chrome/browser/ui/webui/extension_icon_source.cc

@@ -75,10 +75,16 @@ ExtensionIconSource::~ExtensionIconSource() {

GURL ExtensionIconSource::GetIconURL(const Extension* extension,

Extension::Icons icon_size,

ExtensionIconSet::MatchType match,

- bool grayscale) {

+ bool grayscale,

+ bool* exists) {

+ if (exists)

+ *exists = true;

if (extension->id() == extension_misc::kWebStoreAppId)

return GURL("chrome://theme/IDR_WEBSTORE_ICON");

+ if (exists && extension->GetIconURL(icon_size, match) == GURL())

+ *exists = false;

GURL icon_url(base::StringPrintf("%s%s/%d/%d%s",

chrome::kChromeUIExtensionIconURL,

extension->id().c_str(),