Multi-Profiles: Add icon chooser to profiles menu

views/controls/menu/menu_item_view_gtk.cc

Index: views/controls/menu/menu_item_view_gtk.cc
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 9ff9ca12462c61ee85569bb04ed95d54d9926070..d6dbd352b6020f6375afd71e680674bf25fd3f53 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -35,10 +35,12 @@ gfx::Size MenuItemView::CalculatePreferredSize() {
 #else
   int height = font.GetHeight();
 #endif
+  gfx::Size child_size = GetChildPreferredSize();
   return gfx::Size(
       font.GetStringWidth(title_) + label_start_ +
-          item_right_margin_ + GetChildPreferredWidth(),
-      height + GetBottomMargin() + GetTopMargin());
+          item_right_margin_ + child_size.width(),
+      std::max(height, child_size.height()) + GetBottomMargin() +
+          GetTopMargin());
 }
 
 void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {