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

ui/views/controls/menu/menu_config_views.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_config.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 14 matching lines @@
 #if !defined(OS_WIN)
 void MenuConfig::Init(const ui::NativeTheme* theme) {
   InitAura(theme);
 }
 #endif
 
 void MenuConfig::InitAura(const ui::NativeTheme* theme) {
   text_color = theme->GetSystemColor(
       ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor);
   submenu_horizontal_inset = 1;
+  arrow_to_edge_padding = 20;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  arrow_to_edge_padding = 20;
   arrow_width =
       rb.GetImageNamed(IDR_MENU_HIERARCHY_ARROW).ToImageSkia()->width();
-  const gfx::ImageSkia* check = GetMenuCheckImage();
-  check_height = check->height();
+  gfx::ImageSkia check = GetMenuCheckImage(false);
+  check_height = check.height();
   item_min_height = 29;
   separator_spacing_height = 7;
   separator_lower_height = 8;
   separator_upper_height = 8;
   font = rb.GetFont(ResourceBundle::BaseFont);
   label_to_arrow_padding = 20;
   label_to_minor_text_padding = 20;
   always_use_icon_to_label_padding = true;
   align_arrow_and_shortcut = true;
   offset_context_menus = true;
   corner_radius = kMenuCornerRadiusForAura;
 }
 
 #if !defined(OS_WIN)
 // static
 const MenuConfig& MenuConfig::instance(const ui::NativeTheme* theme) {
   static MenuConfig* views_instance = NULL;
   if (!views_instance)
     views_instance = new MenuConfig(theme ?
         theme : ui::NativeTheme::instance());
   return *views_instance;
 }
 #endif
 
 }  // namespace views