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 54 matching lines @@
 // differently than it was when a shortcut was originally created.
 const int kMaxProfileShortcutFileNameLength = 64;
 
 // The avatar badge size needs to be half of the shortcut icon size because
 // the Windows taskbar icon is 32x32 and the avatar icon overlay is 16x16. So to
 // get the shortcut avatar badge and the avatar icon overlay to match up, we
 // need to preserve those ratios when creating the shortcut icon.
 const int kShortcutIconSize = 48;
 const int kProfileAvatarBadgeSize = kShortcutIconSize / 2;
 
 const int kCurrentProfileIconVersion = 2;

[gab, 2014/05/05 22:58:09]

As calamity@ mentioned on issue 369495, you should increment this to force the
static profile icons used for pinned taskbar shortcuts to be regenerated.

(and you should manually test that this indeed works -- I think this is the
first time we actually do this since it was put in place!).

[noms (inactive), 2014/05/06 00:30:03]

Gab: Mike is actually reverting to the status quo of about 2 weeks ago, so in
theory nothing actually has changed...

On 2014/05/05 22:58:09, gab wrote:

[gab, 2014/05/06 18:34:59]

Ah ok, ignore me then :)! Thanks!

 
 // 2x sized profile avatar icons. Mirrors |kDefaultAvatarIconResources| in
 // profile_info_cache.cc.
 const int kProfileAvatarIconResources2x[] = {
   IDR_PROFILE_AVATAR_2X_0,
   IDR_PROFILE_AVATAR_2X_1,
   IDR_PROFILE_AVATAR_2X_2,
   IDR_PROFILE_AVATAR_2X_3,
   IDR_PROFILE_AVATAR_2X_4,
   IDR_PROFILE_AVATAR_2X_5,
@@ skipping 18 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());
+  // TODO(rlp): Share this chunk of code with
+  // avatar_menu_button::DrawTaskBarDecoration.

[noms (inactive), 2014/05/05 16:10:53]

Can we address this TODO? Maybe move the function out to
profile_avatar_icon_util?

[Mike Lerman, 2014/05/06 12:43:15]

Done, refactored the code into profile_avatar_icon_util. I couldn't find
anything in avatar_menu_button that looked similar to this, where I could use
the new common method.

+  SkBitmap source_bitmap = avatar_bitmap;
+  if ((avatar_bitmap.width() == scale_factor * profiles::kAvatarIconWidth) &&
+      (avatar_bitmap.height() == scale_factor * profiles::kAvatarIconHeight)) {
+    // Shave a couple of columns so the bitmap is more square. So when
+    // resized to a square aspect ratio it looks pretty.
+    gfx::Rect frame(scale_factor * profiles::kAvatarIconWidth,
+                    scale_factor * profiles::kAvatarIconHeight);
+    frame.Inset(scale_factor * 2, 0, scale_factor * 2, 0);
+    avatar_bitmap.extractSubset(&source_bitmap, gfx::RectToSkIRect(frame));
+  } else {
+    // If not the icon's aspect ratio, the image should be square.
+    DCHECK(avatar_bitmap.width() == avatar_bitmap.height());
+  }
 
   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;
   }
 }