Added support for icon views (view used instead of icon in a menu item).

ui/views/controls/menu/menu_item_view_win.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_item_view.h"
 
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "grit/ui_strings.h"
 #include "ui/base/native_theme/native_theme_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
 using ui::NativeTheme;
 
 namespace views {
 
 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());
+       !HasNonIconChildViews());
   int default_sys_color;
   int state;
   NativeTheme::State control_state;
 
   if (enabled()) {
     if (render_selection) {
       control_state = NativeTheme::kHovered;
       state = MPI_HOT;
       default_sys_color = COLOR_HIGHLIGHTTEXT;
     } else {
@@ skipping 42 matching lines @@
 
   // Render the foreground.
   // Menu color is specific to Vista, fallback to classic colors if can't
   // get color.
   SkColor fg_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
       ui::NativeThemeWin::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   const gfx::Font& font = GetFont();
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
   int width = this->width() - item_right_margin_ - label_start_ - accel_width;
-  gfx::Rect text_bounds(label_start_, top_margin, width, font.GetHeight());
+  // To keep backward compatibility.
+  int height = has_icon_view_ ? this->height() : font.GetHeight();

[Aaron Boodman, 2012/06/19 00:06:33]

Can you combine the two cases by doing max(this->height(), font.GetHeight()) ?

[yefimt, 2012/06/20 16:53:04]

Done.

+  int flags = (has_icon_view_ ? gfx::Canvas::TEXT_VALIGN_MIDDLE : 0) |

[Aaron Boodman, 2012/06/19 00:06:33]

It seems like it would still be correct to do TEXT_VALIGN_MIDDLE in either case.

[yefimt, 2012/06/20 16:53:04]

Done.

+              GetRootMenuItem()->GetDrawStringFlags();
+  gfx::Rect text_bounds(label_start_, top_margin, width, height);
   text_bounds.set_x(GetMirroredXForRect(text_bounds));
   if (mode == PB_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(title(), font, 0x00000000, 0xFFFFFFFF,
         text_bounds.x(), text_bounds.y(), text_bounds.width(),
-        text_bounds.height(), GetRootMenuItem()->GetDrawStringFlags());
+        text_bounds.height(), flags);
   } else {
     canvas->DrawStringInt(title(), font, fg_color,
                           text_bounds.x(), text_bounds.y(), text_bounds.width(),
-                          text_bounds.height(),
-                          GetRootMenuItem()->GetDrawStringFlags());
+                          text_bounds.height(), flags);
   }
 
   PaintAccelerator(canvas);
 
   if (icon_.width() > 0) {
     gfx::Rect icon_bounds(config.item_left_margin,
-                          top_margin + (height() - top_margin -
+                          top_margin + (this->height() - top_margin -
                           bottom_margin - icon_.height()) / 2,
                           icon_.width(),
                           icon_.height());
     icon_bounds.set_x(GetMirroredXForRect(icon_bounds));
     canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y());
   }
 
   if (HasSubmenu()) {
     int state_id = enabled() ? MSM_NORMAL : MSM_DISABLED;
     gfx::Rect arrow_bounds(this->width() - item_right_margin_ +
                            config.label_to_arrow_padding, 0,
-                           config.arrow_width, height());
+                           config.arrow_width, this->height());
     AdjustBoundsForRTLUI(&arrow_bounds);
 
     // If our sub menus open from right to left (which is the case when the
     // locale is RTL) then we should make sure the menu arrow points to the
     // right direction.
     ui::NativeTheme::ExtraParams extra;
     extra.menu_arrow.pointing_right = !base::i18n::IsRTL();
     extra.menu_arrow.is_selected = render_selection;
     ui::NativeTheme::instance()->Paint(canvas->sk_canvas(),
         ui::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
@@ skipping 29 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->sk_canvas(),
       NativeTheme::kMenuCheck, state, bg_bounds, extra);
 }
 
 }  // namespace views