Revert of Use a single views::MenuConfig instance for each platform

chrome/browser/ui/views/toolbar/app_menu.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/app_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 254 matching lines @@
 
   void Init(InMenuButtonBackground::ButtonType type) {
     SetFocusable(true);
     set_request_focus_on_press(false);
     SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
     in_menu_background_ = new InMenuButtonBackground(type);
     set_background(in_menu_background_);
     SetBorder(views::Border::CreateEmptyBorder(0, kHorizontalPadding, 0,
                                                kHorizontalPadding));
-    SetFontList(MenuConfig::instance().font_list);
   }
 
   void SetOtherButtons(const InMenuButton* left, const InMenuButton* right) {
     in_menu_background_->SetOtherButtons(left, right);
   }
 
   // views::LabelButton
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
+    const MenuConfig& menu_config = MenuConfig::instance(theme);
+    SetFontList(menu_config.font_list);
+
     if (theme) {
       SetTextColor(
           views::Button::STATE_DISABLED,
           theme->GetSystemColor(
               ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor));
       SetTextColor(
           views::Button::STATE_HOVERED,
           theme->GetSystemColor(
               ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor));
       SetTextColor(
@@ skipping 293 matching lines @@
     x += bounds.width();
     bounds.set_x(x);
     bounds.set_width(fullscreen_button_->GetPreferredSize().width() +
                      kFullscreenPadding);
     fullscreen_button_->SetBoundsRect(bounds);
   }
 
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
     AppMenuView::OnNativeThemeChanged(theme);
 
+    const MenuConfig& menu_config = MenuConfig::instance(theme);
     zoom_label_->SetBorder(views::Border::CreateEmptyBorder(
         0, kZoomLabelHorizontalPadding, 0, kZoomLabelHorizontalPadding));
-    zoom_label_->SetFontList(MenuConfig::instance().font_list);
+    zoom_label_->SetFontList(menu_config.font_list);
     zoom_label_max_width_valid_ = false;
 
     if (theme) {
       zoom_label_->SetEnabledColor(theme->GetSystemColor(
           ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor));
       gfx::ImageSkia* full_screen_image =
           ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_FULLSCREEN_MENU_BUTTON);
       SkColor fg_color = theme->GetSystemColor(
           ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor);
@@ skipping 495 matching lines @@
 void AppMenu::PopulateMenu(MenuItemView* parent, MenuModel* model) {
   for (int i = 0, max = model->GetItemCount(); i < max; ++i) {
     // Add the menu item at the end.
     int menu_index = parent->HasSubmenu() ?
         parent->GetSubmenu()->child_count() : 0;
     MenuItemView* item =
         AddMenuItem(parent, menu_index, model, i, model->GetTypeAt(i));
 
     if (model->GetCommandIdAt(i) == IDC_EDIT_MENU ||
         model->GetCommandIdAt(i) == IDC_ZOOM_MENU) {
-      const MenuConfig& config = views::MenuConfig::instance();
+      const MenuConfig& config = item->GetMenuConfig();
       int top_margin = config.item_top_margin + config.separator_height / 2;
       int bottom_margin =
           config.item_bottom_margin + config.separator_height / 2;
 
       // Chromeos adds extra vertical space for the menu buttons.
 #if defined(OS_CHROMEOS)
       top_margin += 4;
       bottom_margin += 5;
 #endif
 
@@ skipping 136 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int AppMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }