Add support for getting the 256x256 app icon on Windows.

ui/gfx/icon_util.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_ICON_UTIL_H_
 #define UI_GFX_ICON_UTIL_H_
 
 #include <windows.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 class Size;
 }
 class FilePath;
 class SkBitmap;
 
@@ skipping 42 matching lines @@
   // the icon into an SkBitmap object containing an ARGB bitmap using the
   // dimensions specified in |s|. |s| must specify valid dimensions (both
   // width() an height() must be greater than zero). If the function cannot
   // convert the icon to a bitmap (most probably due to an invalid parameter),
   // the return value is NULL.
   //
   // The client owns the returned bitmap object and is responsible for deleting
   // it when it is no longer needed.
   static SkBitmap* CreateSkBitmapFromHICON(HICON icon, const gfx::Size& s);
 
+  // Loads an icon resource  as a SkBitmap for the specified |size| from a
+  // loaded .dll or .exe |module|. Supports loading smaller icon sizes as well
+  // as the Vista+ 256x256 PNG icon size. If the icon could not be loaded or
+  // found, returns a NULL scoped_ptr.
+  static scoped_ptr<SkBitmap> CreateSkBitmapFromIconResource(HMODULE module,
+                                                             int resource_id,
+                                                             int size);
+
   // Given a valid HICON handle representing an icon, this function converts
   // the icon into an SkBitmap object containing an ARGB bitmap using the
   // dimensions of HICON. If the function cannot convert the icon to a bitmap
   // (most probably due to an invalid parameter), the return value is NULL.
   //
   // The client owns the returned bitmap object and is responsible for deleting
   // it when it is no longer needed.
   static SkBitmap* CreateSkBitmapFromHICON(HICON icon);
 
   // Creates Windows .ico file at |icon_path|. The icon file is created with
@@ skipping 16 matching lines @@
   static HICON CreateCursorFromDIB(const gfx::Size& icon_size,
                                    const gfx::Point& hotspot,
                                    const void* dib_bits,
                                    size_t dib_size);
 
  private:
   // The icon format is published in the MSDN but there is no definition of
   // the icon file structures in any of the Windows header files so we need to
   // define these structure within the class. We must make sure we use 2 byte
   // packing so that the structures are layed out properly within the file.
+  // See: http://msdn.microsoft.com/en-us/library/ms997538.aspx
 #pragma pack(push)
 #pragma pack(2)
 
   // ICONDIRENTRY contains meta data for an individual icon image within a
   // .ico file.
   struct ICONDIRENTRY {
     BYTE bWidth;
     BYTE bHeight;
     BYTE bColorCount;
     BYTE bReserved;
     WORD wPlanes;
     WORD wBitCount;
     DWORD dwBytesInRes;
     DWORD dwImageOffset;
   };
 
   // ICONDIR Contains information about all the icon images contained within a
   // single .ico file.
   struct ICONDIR {
     WORD idReserved;
     WORD idType;
     WORD idCount;
     ICONDIRENTRY idEntries[1];
   };
 
+  // GRPICONDIRENTRY contains meta data for an individual icon image within a
+  // RT_GROUP_ICON resource in an .exe or .dll.
+  struct GRPICONDIRENTRY {
+    BYTE bWidth;
+    BYTE bHeight;
+    BYTE bColorCount;
+    BYTE bReserved;
+    WORD wPlanes;
+    WORD wBitCount;
+    DWORD dwBytesInRes;
+    WORD nID;
+  };
+
+  // GRPICONDIR Contains information about all the icon images contained within
+  // a RT_GROUP_ICON resource in an .exe or .dll.
+  struct GRPICONDIR {
+    WORD idReserved;
+    WORD idType;
+    WORD idCount;
+    GRPICONDIRENTRY idEntries[1];
+  };
+
   // Contains the actual icon image.
   struct ICONIMAGE {
     BITMAPINFOHEADER icHeader;
     RGBQUAD icColors[1];
     BYTE icXOR[1];
     BYTE icAND[1];
   };
 #pragma pack(pop)
 
   FRIEND_TEST_ALL_PREFIXES(IconUtilTest, TestCreateIconFileWithLargeBitmap);
@@ skipping 67 matching lines @@
   // A helper function of CreateSkBitmapFromHICON.
   static SkBitmap CreateSkBitmapFromHICONHelper(HICON icon,
                                                 const gfx::Size& s);
 
   // Prevent clients from instantiating objects of that class by declaring the
   // ctor/dtor as private.
   DISALLOW_IMPLICIT_CONSTRUCTORS(IconUtil);
 };
 
 #endif  // UI_GFX_ICON_UTIL_H_