Bring back support for 38x31 avatars.

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 25 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/chromium_strings.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_family.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/skia_util.h"
+
 
 using content::BrowserThread;
 
 namespace {
 
 // Name of the badged icon file generated for a given profile.
 const char kProfileIconFileName[] = "Google Profile.ico";
 
 // Characters that are not allowed in Windows filenames. Taken from
 // http://msdn.microsoft.com/en-us/library/aa365247.aspx
@@ skipping 46 matching lines @@
   IDR_PROFILE_AVATAR_2X_24,
   IDR_PROFILE_AVATAR_2X_25,
   IDR_PROFILE_AVATAR_2X_26,
 };
 
 // Badges |app_icon_bitmap| with |avatar_bitmap| at the bottom right corner and
 // returns the resulting SkBitmap.
 SkBitmap BadgeIcon(const SkBitmap& app_icon_bitmap,
                    const SkBitmap& avatar_bitmap,
                    int scale_factor) {
-  // All icons, whether cartoon, GAIA or placeholder, should be square.
-  // TODO(mlerman) - uncomment the ASSERT once noms@ lands the square images.
-  // DCHECK(avatar_bitmap.width() == avatar_bitmap.height());
-
+  SkBitmap source_bitmap = profiles::GetAvatarIconAsSquare(avatar_bitmap,
+                                                           scale_factor);
   int avatar_badge_size = kProfileAvatarBadgeSize;
   if (app_icon_bitmap.width() != kShortcutIconSize) {
     avatar_badge_size =
         app_icon_bitmap.width() * kProfileAvatarBadgeSize / kShortcutIconSize;
   }
   SkBitmap sk_icon = skia::ImageOperations::Resize(
-      avatar_bitmap, skia::ImageOperations::RESIZE_LANCZOS3, avatar_badge_size,
-      avatar_bitmap.height() * avatar_badge_size / avatar_bitmap.width());
+      source_bitmap, skia::ImageOperations::RESIZE_LANCZOS3, avatar_badge_size,
+      source_bitmap.height() * avatar_badge_size / source_bitmap.width());
 
   // Overlay the avatar on the icon, anchoring it to the bottom-right of the
   // icon.
   SkBitmap badged_bitmap;
   badged_bitmap.allocN32Pixels(app_icon_bitmap.width(),
                                app_icon_bitmap.height());
   SkCanvas offscreen_canvas(badged_bitmap);
   offscreen_canvas.clear(SK_ColorTRANSPARENT);
 
   offscreen_canvas.drawBitmap(app_icon_bitmap, 0, 0);
@@ skipping 707 matching lines @@
         // Ensure the profile's icon file has been created.
         CreateOrUpdateProfileIcon(profile->GetPath());
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }