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

ui/views/controls/menu/menu_scroll_view_container.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_scroll_view_container.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
@@ skipping 23 matching lines @@
 class MenuScrollButton : public View {
  public:
   MenuScrollButton(SubmenuView* host, bool is_up)
       : host_(host),
         is_up_(is_up),
         // Make our height the same as that of other MenuItemViews.
         pref_height_(MenuItemView::pref_menu_height()) {
   }
 
   gfx::Size GetPreferredSize() const override {
-    return gfx::Size(MenuConfig::instance().scroll_arrow_height * 2 - 1,
-                     pref_height_);
+    return gfx::Size(
+        host_->GetMenuItem()->GetMenuConfig().scroll_arrow_height * 2 - 1,
+        pref_height_);
   }
 
   bool CanDrop(const OSExchangeData& data) override {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     return true;  // Always return true so that drop events are targeted to us.
   }
 
   void OnDragEntered(const ui::DropTargetEvent& event) override {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragEnteredScrollButton(
         host_, is_up_);
   }
 
   int OnDragUpdated(const ui::DropTargetEvent& event) override {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
   void OnDragExited() override {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_);
   }
 
   int OnPerformDrop(const ui::DropTargetEvent& event) override {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
   void OnPaint(gfx::Canvas* canvas) override {
-    const MenuConfig& config = MenuConfig::instance();
+    const MenuConfig& config = host_->GetMenuItem()->GetMenuConfig();
 
     // The background.
     gfx::Rect item_bounds(0, 0, width(), height());
     NativeTheme::ExtraParams extra;
     extra.menu_item.is_selected = false;
     GetNativeTheme()->Paint(canvas->sk_canvas(),
                             NativeTheme::kMenuItemBackground,
                             NativeTheme::kNormal, item_bounds, extra);
 
     // Then the arrow.
@@ skipping 158 matching lines @@
 }
 
 void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
   if (background()) {
     View::OnPaintBackground(canvas);
     return;
   }
 
   gfx::Rect bounds(0, 0, width(), height());
   NativeTheme::ExtraParams extra;
-  const MenuConfig& menu_config = MenuConfig::instance();
+  const MenuConfig& menu_config = content_view_->GetMenuItem()->GetMenuConfig();
   extra.menu_background.corner_radius = menu_config.corner_radius;
   GetNativeTheme()->Paint(canvas->sk_canvas(),
       NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
 }
 
 void MenuScrollViewContainer::GetAccessibleState(
     ui::AXViewState* state) {
   // Get the name from the submenu view.
   content_view_->GetAccessibleState(state);
 
   // Now change the role.
   state->role = ui::AX_ROLE_MENU_BAR;
   // Some AT (like NVDA) will not process focus events on menu item children
   // unless a parent claims to be focused.
   state->AddStateFlag(ui::AX_STATE_FOCUSED);
 }
 
 void MenuScrollViewContainer::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   gfx::Size content_pref = scroll_view_->GetContents()->GetPreferredSize();
   scroll_up_button_->SetVisible(content_pref.height() > height());
   scroll_down_button_->SetVisible(content_pref.height() > height());
   Layout();
 }
 
 void MenuScrollViewContainer::CreateDefaultBorder() {
   DCHECK_EQ(arrow_, BubbleBorder::NONE);
   bubble_border_ = nullptr;
 
-  const MenuConfig& menu_config = MenuConfig::instance();
+  const MenuConfig& menu_config =
+      content_view_->GetMenuItem()->GetMenuConfig();
 
   int padding = menu_config.use_outer_border && menu_config.corner_radius > 0
                     ? kBorderPaddingDueToRoundedCorners
                     : 0;
 
   int top = menu_config.menu_vertical_border_size + padding;
   int left = menu_config.menu_horizontal_border_size + padding;
   int bottom = menu_config.menu_vertical_border_size + padding;
   int right = menu_config.menu_horizontal_border_size + padding;
 
@@ skipping 28 matching lines @@
     case MENU_ANCHOR_BUBBLE_ABOVE:
       return BubbleBorder::BOTTOM_CENTER;
     case MENU_ANCHOR_BUBBLE_BELOW:
       return BubbleBorder::TOP_CENTER;
     default:
       return BubbleBorder::NONE;
   }
 }
 
 }  // namespace views