Makes it so child views of menuitemview can be traversed with the

views/controls/menu/menu_item_view_win.cc

 // Copyright (c) 2010 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 <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "app/l10n_util.h"
 #include "gfx/canvas.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
 
 using gfx::NativeTheme;
 
 namespace views {
 
 gfx::Size MenuItemView::GetPreferredSize() {
   const gfx::Font& font = MenuConfig::instance().font;
   return gfx::Size(
-      font.GetStringWidth(title_) + label_start_ + item_right_margin_,
+      font.GetStringWidth(title_) + label_start_ + item_right_margin_ +
+          GetChildPreferredWidth(),
       font.height() + GetBottomMargin() + GetTopMargin());
 }
 
 void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
   const MenuConfig& config = MenuConfig::instance();
   bool render_selection =
       (!for_drag && IsSelected() &&
-       parent_menu_item_->GetSubmenu()->GetShowSelection(this));
+       parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
+       GetChildViewCount() == 0);
   int state = render_selection ? MPI_HOT :
                                  (IsEnabled() ? MPI_NORMAL : MPI_DISABLED);
   HDC dc = canvas->beginPlatformPaint();
 
   // The gutter is rendered before the background.
   if (config.render_gutter && !for_drag) {
     gfx::Rect gutter_bounds(label_start_ - config.gutter_to_label -
                             config.gutter_width, 0, config.gutter_width,
                             height());
     AdjustBoundsForRTLUI(&gutter_bounds);
@@ skipping 43 matching lines @@
 
   // Render the foreground.
   // Menu color is specific to Vista, fallback to classic colors if can't
   // get color.
   int default_sys_color = render_selection ? COLOR_HIGHLIGHTTEXT :
       (IsEnabled() ? COLOR_MENUTEXT : COLOR_GRAYTEXT);
   SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault(
       NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   int width = this->width() - item_right_margin_ - label_start_;
-  const gfx::Font& font = MenuConfig::instance().font;
+  const gfx::Font& font = GetChildViewCount() > 0 ?
+      MenuConfig::instance().font_with_controls : MenuConfig::instance().font;
   gfx::Rect text_bounds(label_start_, top_margin, width, font.height());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   if (for_drag) {
     // With different themes, it's difficult to tell what the correct
     // foreground and background colors are for the text to draw the correct
     // halo. Instead, just draw black on white, which will look good in most
     // cases.
     canvas->DrawStringWithHalo(GetTitle(), font, 0x00000000, 0xFFFFFFFF,
                                text_bounds.x(), text_bounds.y(),
                                text_bounds.width(), text_bounds.height(),
@@ skipping 33 matching lines @@
 
     RECT arrow_rect = arrow_bounds.ToRECT();
     NativeTheme::instance()->PaintMenuArrow(
         NativeTheme::MENU, dc, MENU_POPUPSUBMENU, state_id, &arrow_rect,
         arrow_direction, render_selection);
   }
   canvas->endPlatformPaint();
 }
 
 }  // namespace views