Replaced GetAppIconForSize with GetAppIconImageFamily.

chrome/browser/app_icon_win.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/app_icon_win.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/image/image_family.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/installer/util/install_util.h"
 #endif
 
 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() {
+  // TODO(mgiuca): Use GetAppIconForSize instead of LoadIcon, to get correct
+  // scaling. (See http://crbug.com/551256)
   const int icon_id = GetAppIconResourceId();
   // HICON returned from LoadIcon do not leak and do not have to be destroyed.
   return LoadIcon(GetModuleHandle(chrome::kBrowserResourcesDll),
                   MAKEINTRESOURCE(icon_id));
 }
 
 HICON GetSmallAppIcon() {
+  // TODO(mgiuca): Use GetAppIconForSize instead of LoadImage, to get correct
+  // scaling. (See http://crbug.com/551256)
   const int icon_id = GetAppIconResourceId();
+  gfx::Size size = GetSmallAppIconSize();
   // HICON returned from LoadImage must be released using DestroyIcon.
   return static_cast<HICON>(LoadImage(
       GetModuleHandle(chrome::kBrowserResourcesDll), MAKEINTRESOURCE(icon_id),
-      IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
-      LR_DEFAULTCOLOR | LR_SHARED));
+      IMAGE_ICON, size.width(), size.height(), LR_DEFAULTCOLOR | LR_SHARED));
+}
+
+gfx::Size GetAppIconSize() {
+  return gfx::Size(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
+}
+
+gfx::Size GetSmallAppIconSize() {
+  return gfx::Size(GetSystemMetrics(SM_CXSMICON),
+                   GetSystemMetrics(SM_CYSMICON));
+}
+
+scoped_ptr<gfx::ImageFamily> GetAppIconImageFamily() {
+  const int icon_id = GetAppIconResourceId();
+  return IconUtil::CreateImageFamilyFromIconResource(
+      GetModuleHandle(chrome::kBrowserResourcesDll), icon_id);
+}
+
+scoped_ptr<SkBitmap> GetAppIconForSize(const gfx::Size& size) {
+  scoped_ptr<gfx::ImageFamily> family = GetAppIconImageFamily();
+  if (!family)
+    return make_scoped_ptr(new SkBitmap);

[calamity, 2015/11/09 02:12:11]

nit: Why not just return an empty scoped_ptr?

[Matt Giuca, 2015/11/10 06:56:53]

Done.

+
+  // Note: We could just use the LoadImage function from the Windows API, but
+  // that does a *terrible* job scaling images. Therefore, we fetch the original
+  // images and do our own high-quality scaling.
+  gfx::Image image = family->CreateExact(size);
+  return make_scoped_ptr(new SkBitmap(image.AsBitmap()));
 }
 
 scoped_ptr<SkBitmap> GetAppIconForSize(int size) {
-  const int icon_id = GetAppIconResourceId();
-  return IconUtil::CreateSkBitmapFromIconResource(
-      GetModuleHandle(chrome::kBrowserResourcesDll), icon_id, size);
+  return GetAppIconForSize(gfx::Size(size, size));
 }