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

Also, adds an icon (a copy of chrome/app/theme/chromium/chromium.ico) to ui_unittests.exe, which is needed by the tests for this new functionality.

The icon was landed here: https://codereview.chromium.org/11877018/

BUG=167277
TEST=New unit tests in icon_util_unittests.cc.

Review URL: https://chromiumcodereview.appspot.com/11778073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176700 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 14 deletions

diff --git a/chrome/browser/app_icon_win.cc b/chrome/browser/app_icon_win.cc
index addec59..e893b4e 100644
--- a/chrome/browser/app_icon_win.cc
+++ b/chrome/browser/app_icon_win.cc
@@ -6,32 +6,35 @@
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_constants.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/icon_util.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/installer/util/install_util.h"
 #endif
 
-HICON GetAppIcon() {
+namespace {
+
+// Returns the resource id of the application icon.
+int GetAppIconResourceId() {
   int icon_id = IDR_MAINFRAME;
 #if defined(GOOGLE_CHROME_BUILD)
   if (InstallUtil::IsChromeSxSProcess())
     icon_id = IDR_SXS;
 #endif
+  return icon_id;
+}
+
+}  // namespace
+
+HICON GetAppIcon() {
+  const int icon_id = GetAppIconResourceId();
   return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
                   MAKEINTRESOURCE(icon_id));
 }
 
-HICON GetAppIconForSize(int size) {
-  int icon_id = IDR_MAINFRAME;
-#if defined(GOOGLE_CHROME_BUILD)
-  if (InstallUtil::IsChromeSxSProcess())
-    icon_id = IDR_SXS;
-#endif
-  return static_cast<HICON>(
-      LoadImage(GetModuleHandle(chrome::kBrowserResourcesDll),
-                MAKEINTRESOURCE(icon_id),
-                IMAGE_ICON,
-                size,
-                size,
-                LR_DEFAULTCOLOR | LR_DEFAULTSIZE));
+scoped_ptr<SkBitmap> GetAppIconForSize(int size) {
+  const int icon_id = GetAppIconResourceId();
+  return IconUtil::CreateSkBitmapFromIconResource(
+      GetModuleHandle(chrome::kBrowserResourcesDll), icon_id, size);
 }