Multi-Profiles: Add icon chooser to profiles menu

views/controls/menu/menu_item_view_win.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 <uxtheme.h>
 #include <Vssym32.h>
 
 #include "grit/ui_strings.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
 
 using gfx::NativeTheme;
 
 namespace views {
 
 gfx::Size MenuItemView::CalculatePreferredSize() {
+  gfx::Size child_size = GetChildPreferredSize();
   const gfx::Font& font = GetFont();
   return gfx::Size(
       font.GetStringWidth(title_) + label_start_ + item_right_margin_ +
-          GetChildPreferredWidth(),
-      font.GetHeight() + GetBottomMargin() + GetTopMargin());
+          child_size.width(),
+      std::max(child_size.height(), font.GetHeight()) + 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 default_sys_color;
   int state;
@@ skipping 134 matching lines @@
       NativeTheme::kMenuCheckBackground, state, bg_bounds, extra);
 
   // And the check.
   gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
   AdjustBoundsForRTLUI(&icon_bounds);
   NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
       NativeTheme::kMenuCheck, state, bg_bounds, extra);
 }
 
 }  // namespace views