Add in resize logic for the non-badged icons.

chrome/browser/ui/views/profiles/avatar_menu_bubble_view.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/ui/views/profiles/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 241 matching lines @@
 ProfileItemView::ProfileItemView(const AvatarMenu::Item& item,
                                  AvatarMenuBubbleView* parent,
                                  AvatarMenu* menu)
     : views::CustomButton(parent),
       item_(item),
       parent_(parent),
       menu_(menu) {
   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.
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   name_label_ = new views::Label(item_.name,
                                  rb->GetFontList(item_.active ?
                                                  ui::ResourceBundle::BoldFont :
                                                  ui::ResourceBundle::BaseFont));
   name_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(name_label_);
@@ skipping 522 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }