diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 22:42:24 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 22:42:24 +0000 |
| commit | 49c76cc58cba54c9ac4df003a1034601bde2a445 (patch) | |
| tree | f00b30ab636ff8fb0ade59d522cb09c951118a8e | |
| parent | 5dd7760a548f66bc3c01edbb528973251ef26985 (diff) | |
| download | chromium_src-49c76cc58cba54c9ac4df003a1034601bde2a445.zip chromium_src-49c76cc58cba54c9ac4df003a1034601bde2a445.tar.gz chromium_src-49c76cc58cba54c9ac4df003a1034601bde2a445.tar.bz2 | |
Merge 60119 - use larger icon if available
BUG=56301
TEST=go to an offline app page with a 128px icon defined
Review URL: http://codereview.chromium.org/3471002
TBR=erikkay@chromium.org
Review URL: http://codereview.chromium.org/3501010
git-svn-id: svn://svn.chromium.org/chrome/branches/517/src@60540 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index b04cf77..87ac3e3 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -673,8 +673,12 @@ void BrowserRenderProcessHost::SendExtensionInfo() { info.web_extent = extension->web_extent(); info.name = extension->name(); info.location = extension->location(); - info.icon_url = extension->GetIconURL(Extension::EXTENSION_ICON_MEDIUM, - ExtensionIconSet::MATCH_BIGGER); + + // The icon in the page is 96px. We'd rather not scale up, so use 128. + info.icon_url = extension->GetIconURL(Extension::EXTENSION_ICON_LARGE, + ExtensionIconSet::MATCH_EXACTLY); + if (info.icon_url.is_empty()) + info.icon_url = GURL("chrome://theme/IDR_APP_DEFAULT_ICON"); params.extensions.push_back(info); } |