Add in resize logic for the non-badged icons.

chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc

Index: chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
index aa3b695147aa85ca215b3e0b86f10069d11cea3d..1ec2d9d8f4f0e38d0b283479cc9fcc5ba870be97 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
@@ -259,11 +259,14 @@ ProfileItemView::ProfileItemView(const AvatarMenu::Item& item,
   set_notify_enter_exit_on_child(true);
 
   image_view_ = new ProfileImageView();
-  gfx::ImageSkia profile_icon = *item_.icon.ToImageSkia();
-  if (item_.active || item_.signin_required)
+  // GetSizedAvatarIcon will resize the icon in case it's too large.
+  const gfx::ImageSkia profile_icon = *profiles::GetSizedAvatarIcon(item_.icon,
+      false, profiles::kAvatarIconWidth, kItemHeight).ToImageSkia();
+  if (item_.active || item_.signin_required) {

[msw, 2014/04/29 21:25:10]

nit: remove unnecessary braces

[Mike Lerman, 2014/04/30 13:12:47]

Done.

     image_view_->SetImage(GetBadgedIcon(profile_icon));
-  else
+  } else {
     image_view_->SetImage(profile_icon);
+  }
   AddChildView(image_view_);
 
   // Add a label to show the profile name.