Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it avail…

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();
+  const MenuConfig& config = GetMenuConfig();
 
   bool render_selection =
       (mode == PB_NORMAL && IsSelected() &&
        parent_menu_item_->GetSubmenu()->GetShowSelection(this) &&
        (NonIconChildViewsCount() == 0));
   int default_sys_color;
   int state;
   NativeTheme::State control_state;
 
   if (enabled()) {
@@ skipping 101 matching lines @@
   int icon_height;
   if (type_ == RADIO) {
     icon_width = config.radio_width;
     icon_height = config.radio_height;
   } else {
     icon_width = config.check_width;
     icon_height = config.check_height;
   }
 
   int top_margin = GetTopMargin();
-  int icon_x = MenuConfig::instance().item_left_margin;
+  int icon_x = GetMenuConfig().item_left_margin;
   int icon_y = top_margin +
       (height() - top_margin - GetBottomMargin() - icon_height) / 2;
   NativeTheme::ExtraParams extra;
   extra.menu_check.is_radio = type_ == RADIO;
   extra.menu_check.is_selected = selection_state == SELECTED;
 
   // Draw the background.
   gfx::Rect bg_bounds(0, 0, icon_x + icon_width, height());
   AdjustBoundsForRTLUI(&bg_bounds);
   NativeTheme::instance()->Paint(canvas->sk_canvas(),
       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