Replaced GetAppIconForSize with GetAppIconImageFamily.

chrome/browser/profiles/profile_shortcut_manager_win.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 
 #include <shlobj.h>  // For SHChangeNotify().
 
 #include <string>
 #include <vector>
@@ skipping 153 matching lines @@
     const SkBitmap& avatar_bitmap_1x,
     const SkBitmap& avatar_bitmap_2x) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (!base::PathExists(profile_path)) {
     LOG(ERROR) << "Profile directory " << profile_path.value()
                << " did not exist when trying to create profile icon";
     return base::FilePath();
   }
 
-  scoped_ptr<SkBitmap> app_icon_bitmap(GetAppIconForSize(kShortcutIconSize));
-  if (!app_icon_bitmap)
+  scoped_ptr<gfx::ImageFamily> family = GetAppIconImageFamily();
+  if (!family)
+    return base::FilePath();
+
+  // TODO(mgiuca): A better approach would be to badge each image in the
+  // ImageFamily (scaling the badge to the correct size), and then re-export the
+  // family (as opposed to making a family with just 48 and 256, then scaling
+  // those images to about a dozen different sizes).
+  SkBitmap app_icon_bitmap =
+      family->CreateExact(kShortcutIconSize, kShortcutIconSize).AsBitmap();
+  if (app_icon_bitmap.isNull())
     return base::FilePath();
 
   gfx::ImageFamily badged_bitmaps;
   if (!avatar_bitmap_1x.empty()) {
     badged_bitmaps.Add(gfx::Image::CreateFrom1xBitmap(
-        BadgeIcon(*app_icon_bitmap, avatar_bitmap_1x, 1)));
+        BadgeIcon(app_icon_bitmap, avatar_bitmap_1x, 1)));
   }
 
-  scoped_ptr<SkBitmap> large_app_icon_bitmap(
-      GetAppIconForSize(IconUtil::kLargeIconSize));
-  if (large_app_icon_bitmap && !avatar_bitmap_2x.empty()) {
+  SkBitmap large_app_icon_bitmap =
+      family->CreateExact(IconUtil::kLargeIconSize, IconUtil::kLargeIconSize)
+          .AsBitmap();
+  if (!large_app_icon_bitmap.isNull() && !avatar_bitmap_2x.empty()) {
     badged_bitmaps.Add(gfx::Image::CreateFrom1xBitmap(
-        BadgeIcon(*large_app_icon_bitmap, avatar_bitmap_2x, 2)));
+        BadgeIcon(large_app_icon_bitmap, avatar_bitmap_2x, 2)));
   }
 
   // If we have no badged bitmaps, we should just use the default chrome icon.
   if (badged_bitmaps.empty()) {
-    badged_bitmaps.Add(gfx::Image::CreateFrom1xBitmap(*app_icon_bitmap));
-    if (large_app_icon_bitmap) {
-      badged_bitmaps.Add(
-          gfx::Image::CreateFrom1xBitmap(*large_app_icon_bitmap));
+    badged_bitmaps.Add(gfx::Image::CreateFrom1xBitmap(app_icon_bitmap));
+    if (!large_app_icon_bitmap.isNull()) {
+      badged_bitmaps.Add(gfx::Image::CreateFrom1xBitmap(large_app_icon_bitmap));
     }
   }
   // Finally, write the .ico file containing this new bitmap.
   const base::FilePath icon_path =
       profiles::internal::GetProfileIconPath(profile_path);
   const bool had_icon = base::PathExists(icon_path);
 
   if (!IconUtil::CreateIconFileFromImageFamily(badged_bitmaps, icon_path)) {
     // This can happen in theory if the profile directory is deleted between the
     // beginning of this function and here; however this is extremely unlikely
@@ skipping 658 matching lines @@
         // Ensure the profile's icon file has been created.
         CreateOrUpdateProfileIcon(profile->GetPath());
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }