diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 04:43:49 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 04:43:49 +0000 |
| commit | 7842b4f9187e716c2da05fa560ff648a65bd490d (patch) | |
| tree | 12cf60ad3a8b0d7d1cebbbe7b43ef8fd7769b85f /chrome/browser/jumplist_win.cc | |
| parent | 5673b4b450ccbc21a10ae1b63002ba1c7a057f21 (diff) | |
| download | chromium_src-7842b4f9187e716c2da05fa560ff648a65bd490d.zip chromium_src-7842b4f9187e716c2da05fa560ff648a65bd490d.tar.gz chromium_src-7842b4f9187e716c2da05fa560ff648a65bd490d.tar.bz2 | |
App shortcut icons on Windows are now 256x256 instead of 32x32.
icon_util.CreateIconFileFromSkBitmap has been replaced with
CreateIconFileFromImageFamily, which uses a set of differently-sized icons to
produce the Windows .ico file with each bitmap scaled from the best available
icon size.
For both apps and badged Chrome logo shortcuts, icons in the "Medium icons" view
are no longer scaled up to 48x48 from 32x32.
In the "Large icons" and "Extra large icons" views, if an app provides an icon
>48x48, Windows now displays the icon at full size (96x96 or 256x256,
respectively), instead of at 48x48 with a box around it.
BUG=163864
TEST=Create web shortcut, should be a 48x48 icon. Create v2 app shortcut,
should be a 256x256 icon with no pixelated bitmaps at any size <= 128x128.
Review URL: https://chromiumcodereview.appspot.com/14221004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jumplist_win.cc')
| -rw-r--r-- | chrome/browser/jumplist_win.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index de8aaa9..f2b0372 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -47,6 +47,7 @@ #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/icon_util.h" +#include "ui/gfx/image/image_family.h" using content::BrowserThread; @@ -236,7 +237,9 @@ bool CreateIconFile(const SkBitmap& bitmap, // Create an icon file from the favicon attached to the given |page|, and // save it as the temporary file. - if (!IconUtil::CreateIconFileFromSkBitmap(bitmap, SkBitmap(), path)) + gfx::ImageFamily image_family; + image_family.Add(gfx::Image::CreateFrom1xBitmap(bitmap)); + if (!IconUtil::CreateIconFileFromImageFamily(image_family, path)) return false; // Add this icon file to the list and return its absolute path. |