diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 19:02:59 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 19:02:59 +0000 |
| commit | 6ed46c8295401386f3764f5155e9c513949f7c1c (patch) | |
| tree | 5ea7af6ac99f10cc3b705c2623bac68cc4721b84 /chrome | |
| parent | 1f21a52382e86370a3b51a919763fc6bd76657ee (diff) | |
| download | chromium_src-6ed46c8295401386f3764f5155e9c513949f7c1c.zip chromium_src-6ed46c8295401386f3764f5155e9c513949f7c1c.tar.gz chromium_src-6ed46c8295401386f3764f5155e9c513949f7c1c.tar.bz2 | |
Add support for adding 256x256 pngs to Windows .ico files.
These are needed to support the "large icon" view under Vista+.
BUG=167277,163864,110379
TEST=New unit test.
Review URL: https://chromiumcodereview.appspot.com/11742007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/jumplist_win.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_shortcut_manager_win.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/web_applications/web_app_win.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 91c0120..c01ff30 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -263,7 +263,7 @@ 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, path)) + if (!IconUtil::CreateIconFileFromSkBitmap(bitmap, SkBitmap(), path)) return false; // Add this icon file to the list and return its absolute path. diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index 8bb0e43..c050aed 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc @@ -92,7 +92,9 @@ FilePath CreateChromeDesktopShortcutIconForProfile( // Finally, write the .ico file containing this new bitmap. const FilePath icon_path = profile_path.AppendASCII(profiles::internal::kProfileIconFileName); - if (!IconUtil::CreateIconFileFromSkBitmap(final_bitmap, icon_path)) + // TODO(asvitkine): Create icon with a large 256x256 bitmap. + if (!IconUtil::CreateIconFileFromSkBitmap(final_bitmap, SkBitmap(), + icon_path)) return FilePath(); return icon_path; diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc index 9ccd7a7..8a6419d 100644 --- a/chrome/browser/web_applications/web_app_win.cc +++ b/chrome/browser/web_applications/web_app_win.cc @@ -35,7 +35,7 @@ void GetImageCheckSum(const SkBitmap& image, base::MD5Digest* digest) { // Saves |image| as an |icon_file| with the checksum. bool SaveIconWithCheckSum(const FilePath& icon_file, const SkBitmap& image) { - if (!IconUtil::CreateIconFileFromSkBitmap(image, icon_file)) + if (!IconUtil::CreateIconFileFromSkBitmap(image, SkBitmap(), icon_file)) return false; base::MD5Digest digest; |