Replaced GetAppIconForSize with GetAppIconImageFamily.

chrome/browser/app_icon_win.h

Index: chrome/browser/app_icon_win.h
diff --git a/chrome/browser/app_icon_win.h b/chrome/browser/app_icon_win.h
index 7a29d1f374386ce8d3327b96d636ae444237ea8d..fefa66e9babb506201cc1d9d5e9d028c149388d1 100644
--- a/chrome/browser/app_icon_win.h
+++ b/chrome/browser/app_icon_win.h
@@ -9,14 +9,29 @@
 
 #include "base/memory/scoped_ptr.h"
 
+namespace gfx {
+class ImageFamily;
+class Size;
+}
+
 class SkBitmap;
 
 HICON GetAppIcon();
 HICON GetSmallAppIcon();
 
-// Retrieve the application icon for the given size. Note that if you specify a
-// size other than what is contained in chrome.dll (16x16, 32x32, 48x48), this
-// might return a poorly resized icon.
+gfx::Size GetAppIconSize();
+gfx::Size GetSmallAppIconSize();
+
+// Retrieve the application icon for the current process. This returns all of
+// the different sizes of the icon as an ImageFamily.
+scoped_ptr<gfx::ImageFamily> GetAppIconImageFamily();
+
+// Retrieve the application icon for the given size. If |size| is not one of the
+// sizes contained in chrome.dll (16x16, 32x32, 48x48), this will scale the
+// nearest larger image to the desired size.
+// Note: To fetch multiple images, call GetAppIconImageFamily(); do not call
+// this repeatedly as it internally builds the ImageFamily each time.

[Nico, 2015/11/10 07:13:31]

Is it possible to remove these functions here then? Working with the ImageFamily
shouldn't be much harder, and not everyone adding a call to these will read this
comment.

[Matt Giuca, 2015/11/11 02:36:23]

Fair enough. I will just inline this code when I need it.

Done.

+scoped_ptr<SkBitmap> GetAppIconForSize(const gfx::Size& size);
 scoped_ptr<SkBitmap> GetAppIconForSize(int size);
 
 #endif  // CHROME_BROWSER_APP_ICON_WIN_H_