Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2228)

Unified Diff: chrome/browser/app_icon_win.h

Issue 1408063012: Replaced GetAppIconForSize with GetAppIconImageFamily. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master-plus
Patch Set: Split off ImageFamily stuff into CL 1424913007. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/app_icon_win.cc » ('j') | chrome/browser/app_icon_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
+scoped_ptr<SkBitmap> GetAppIconForSize(const gfx::Size& size);
scoped_ptr<SkBitmap> GetAppIconForSize(int size);
#endif // CHROME_BROWSER_APP_ICON_WIN_H_
« no previous file with comments | « no previous file | chrome/browser/app_icon_win.cc » ('j') | chrome/browser/app_icon_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698