Bring back support for 38x31 avatars.

chrome/browser/profiles/profile_avatar_icon_util.cc

 // Copyright 2014 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_avatar_icon_util.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_paths.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/skia_util.h"
 
 // Helper methods for transforming and drawing avatar icons.
 namespace {
 
 // Determine what the scaled height of the avatar icon should be for a
 // specified width, to preserve the aspect ratio.
 int GetScaledAvatarHeightForWidth(int width, const gfx::ImageSkia& avatar) {
   // Multiply the width by the inverted aspect ratio (height over
   // width), and then add 0.5 to ensure the int truncation rounds nicely.
   int scaled_height = width *
@@ skipping 142 matching lines @@
 }  // namespace
 
 namespace profiles {
 
 struct IconResourceInfo {
   int resource_id;
   const char* filename;
 };
 
 const int kAvatarIconWidth = 38;
-const int kAvatarIconHeight = 38;
+const int kAvatarIconHeight = 31;
 const SkColor kAvatarTutorialBackgroundColor = SkColorSetRGB(0x42, 0x85, 0xf4);
 const SkColor kAvatarTutorialContentTextColor = SkColorSetRGB(0xc6, 0xda, 0xfc);
 const SkColor kAvatarBubbleAccountsBackgroundColor =
     SkColorSetRGB(0xf3, 0xf3, 0xf3);
 
 const char kDefaultUrlPrefix[] = "chrome://theme/IDR_PROFILE_AVATAR_";
 const char kGAIAPictureFileName[] = "Google Profile Picture.png";
 const char kHighResAvatarFolderName[] = "Avatars";
 
 // This avatar does not exist on the server, the high res copy is in the build.
@@ skipping 59 matching lines @@
           *image.ToImageSkia(),
           dst_size,
           size,
           AvatarImageSource::POSITION_BOTTOM_CENTER,
           is_gaia_image ? AvatarImageSource::BORDER_ETCHED :
               AvatarImageSource::BORDER_NONE));
 
   return gfx::Image(gfx::ImageSkia(source.release(), dst_size));
 }
 
+SkBitmap GetAvatarIconAsSquare(const SkBitmap& bitmap, int scale_factor) {
+  if ((bitmap.width() == scale_factor * profiles::kAvatarIconWidth) &&
+      (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.
+    SkBitmap cropped_bitmap;
+    gfx::Rect frame(scale_factor * profiles::kAvatarIconWidth,
+                    scale_factor * profiles::kAvatarIconHeight);
+    frame.Inset(scale_factor * 2, 0, scale_factor * 2, 0);
+    bitmap.extractSubset(&cropped_bitmap, gfx::RectToSkIRect(frame));
+    return cropped_bitmap;
+  } else {
+    // If not the avatar icon's aspect ratio, the image should be square.
+    DCHECK(bitmap.width() == bitmap.height());
+    return bitmap;
+  }
+}
+
 // Helper methods for accessing, transforming and drawing avatar icons.
 size_t GetDefaultAvatarIconCount() {
   return kDefaultAvatarIconsCount;
 }
 
 size_t GetGenericAvatarIconCount() {
   return kGenericAvatarIconsCount;
 }
 
 int GetPlaceholderAvatarIndex() {
@@ skipping 82 matching lines @@
         int_value >= static_cast<int>(kDefaultAvatarIconsCount))
       return false;
     *icon_index = int_value;
     return true;
   }
 
   return false;
 }
 
 }  // namespace profiles