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

ui/views/controls/menu/menu_controller.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_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 1674 matching lines @@
 
 void MenuController::BuildMenuItemPath(MenuItemView* item,
                                        std::vector<MenuItemView*>* path) {
   if (!item)
     return;
   BuildMenuItemPath(item->GetParentMenuItem(), path);
   path->push_back(item);
 }
 
 void MenuController::StartShowTimer() {
+  MenuItemView* item = pending_state_.item ? pending_state_.item : state_.item;
   show_timer_.Start(
-      FROM_HERE, TimeDelta::FromMilliseconds(MenuConfig::instance().show_delay),
+      FROM_HERE, TimeDelta::FromMilliseconds(item->GetMenuConfig().show_delay),
       this, &MenuController::CommitPendingSelection);
 }
 
 void MenuController::StopShowTimer() {
   show_timer_.Stop();
 }
 
 void MenuController::StartCancelAllTimer() {
   cancel_all_timer_.Start(FROM_HERE,
                           TimeDelta::FromMilliseconds(kCloseOnExitTime),
@@ skipping 22 matching lines @@
   pref.set_width(std::min(pref.width(),
                             item->GetDelegate()->GetMaxWidthForMenu(item)));
   if (!state_.monitor_bounds.IsEmpty())
     pref.set_width(std::min(pref.width(), state_.monitor_bounds.width()));
 
   // Assume we can honor prefer_leading.
   *is_leading = prefer_leading;
 
   int x, y;
 
-  const MenuConfig& menu_config = MenuConfig::instance();
+  const MenuConfig& menu_config = item->GetMenuConfig();
 
   if (!item->GetParentMenuItem()) {
     // First item, position relative to initial location.
     x = state_.initial_bounds.x();
 
     // Offsets for context menu prevent menu items being selected by
     // simply opening the menu (bug 142992).
     if (menu_config.offset_context_menus && state_.context_menu)
       x += 1;
 
@@ skipping 779 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views