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

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"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
@@ skipping 30 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()) {
   }
 
   virtual gfx::Size GetPreferredSize() {
-    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_);
   }
 
   virtual bool CanDrop(const OSExchangeData& data) {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     return true;  // Always return true so that drop events are targeted to us.
   }
 
   virtual void OnDragEntered(const ui::DropTargetEvent& event) {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragEnteredScrollButton(
         host_, is_up_);
   }
 
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
   virtual void OnDragExited() {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_);
   }
 
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) {
-    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;
     NativeTheme::instance()->Paint(canvas->sk_canvas(),
                                    NativeTheme::kMenuItemBackground,
                                    NativeTheme::kNormal, item_bounds, extra);
 #if defined(OS_WIN)
     SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
@@ skipping 86 matching lines @@
   scroll_up_button_ = new MenuScrollButton(content_view, true);
   scroll_down_button_ = new MenuScrollButton(content_view, false);
   AddChildView(scroll_up_button_);
   AddChildView(scroll_down_button_);
 
   scroll_view_ = new MenuScrollView(content_view);
   AddChildView(scroll_view_);
 
   MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate();
   if (delegate) {
-    set_border(delegate->CreateMenuBorder());
+    Border* border = delegate->CreateMenuBorder();
+    if (!border) {
+      const MenuConfig& menu_config =
+          content_view_->GetMenuItem()->GetMenuConfig();
+      border = Border::CreateEmptyBorder(
+          menu_config.submenu_vertical_margin_size,
+          menu_config.submenu_horizontal_margin_size,
+          menu_config.submenu_vertical_margin_size,
+          menu_config.submenu_horizontal_margin_size);
+    }
+    set_border(border);
+
     set_background(delegate->CreateMenuBackground());
   }
 }
 
 void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
   if (background()) {
     View::OnPaintBackground(canvas);
     return;
   }
 
@@ skipping 57 matching lines @@
 
 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();
 }
 
 }  // namespace views