Multi-Profiles: Add icon chooser to profiles menu

views/controls/menu/menu_item_view_gtk.cc

 // Copyright (c) 2011 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 "views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 17 matching lines @@
 const int kMinTouchHeight = 46;
 #endif
 
 gfx::Size MenuItemView::CalculatePreferredSize() {
   const gfx::Font& font = GetFont();
 #if defined(TOUCH_UI)
   int height = std::max(font.GetHeight(), kMinTouchHeight);
 #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) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
       (mode == PB_NORMAL && IsSelected() &&
        parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
        !has_children());
 
   int icon_x = config.item_left_margin;
@@ skipping 72 matching lines @@
                            top_margin + (available_height -
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     canvas->DrawBitmapInt(*GetSubmenuArrowImage(),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views