views: Make sure menu checks and submenu arrows have high contrast even when selected.

ui/views/controls/menu/menu_item_view.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 "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 804 matching lines @@
 
     native_theme->Paint(canvas->sk_canvas(),
                         ui::NativeTheme::kMenuItemBackground,
                         ui::NativeTheme::kHovered,
                         item_bounds,
                         ui::NativeTheme::ExtraParams());
   }
 
   // Render the check.
   if (type_ == CHECKBOX && delegate->IsItemChecked(GetCommand())) {
-    const gfx::ImageSkia* check = GetMenuCheckImage();
+    gfx::ImageSkia check = GetMenuCheckImage(IsSelected());
     // Don't use config.check_width here as it's padded
     // to force more padding (AURA).
-    gfx::Rect check_bounds(icon_x, icon_y, check->width(), icon_height);
+    gfx::Rect check_bounds(icon_x, icon_y, check.width(), icon_height);
     AdjustBoundsForRTLUI(&check_bounds);
-    canvas->DrawImageInt(*check, check_bounds.x(), check_bounds.y());
+    canvas->DrawImageInt(check, check_bounds.x(), check_bounds.y());
   } else if (type_ == RADIO) {
-    const gfx::ImageSkia* image =
+    gfx::ImageSkia image =
         GetRadioButtonImage(delegate->IsItemChecked(GetCommand()));
     gfx::Rect radio_bounds(icon_x,
                            top_margin +
                            (height() - top_margin - bottom_margin -
-                            image->height()) / 2,
-                           image->width(),
-                           image->height());
+                               image.height()) / 2,
+                           image.width(),
+                           image.height());
     AdjustBoundsForRTLUI(&radio_bounds);
-    canvas->DrawImageInt(*image, radio_bounds.x(), radio_bounds.y());
+    canvas->DrawImageInt(image, radio_bounds.x(), radio_bounds.y());
   }
 
   // Render the foreground.
   ui::NativeTheme::ColorId color_id =
       ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor;
   if (enabled()) {
     color_id = render_selection ?
         ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor:
         ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor;
   }
@@ skipping 38 matching lines @@
   PaintMinorText(canvas, render_selection);
 
   // Render the submenu indicator (arrow).
   if (HasSubmenu()) {
     gfx::Rect arrow_bounds(this->width() - config.arrow_width -
                                config.arrow_to_edge_padding,
                            top_margin + (available_height -
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
-    canvas->DrawImageInt(*GetSubmenuArrowImage(),
+    canvas->DrawImageInt(GetSubmenuArrowImage(IsSelected()),
                          arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 void MenuItemView::PaintMinorText(gfx::Canvas* canvas,
                                   bool render_selection) {
   string16 minor_text = GetMinorText();
   if (minor_text.empty())
     return;
 
@@ skipping 199 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views