summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/extension_icon_source.cc
diff options
context:
space:
mode:
authorgbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 17:55:45 +0000
committergbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 17:55:45 +0000
commit98e6cd23a04b3b0fa877058640b35c2e246b358c (patch)
treefc39b9701811e4c417870879fa2a1433181bcd66 /chrome/browser/ui/webui/extension_icon_source.cc
parent052cb103f371c64490afdbae90b692e03253dd45 (diff)
downloadchromium_src-98e6cd23a04b3b0fa877058640b35c2e246b358c.zip
chromium_src-98e6cd23a04b3b0fa877058640b35c2e246b358c.tar.gz
chromium_src-98e6cd23a04b3b0fa877058640b35c2e246b358c.tar.bz2
Improve layout for bookmark-apps. Add a treatment for small icons.
BUG=none TEST=none Review URL: http://codereview.chromium.org/7452008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/extension_icon_source.cc')
-rw-r--r--chrome/browser/ui/webui/extension_icon_source.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc
index 78c7b27..6a52ba6 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(),