Added support for icon views (view used instead of icon in a menu item).

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 147 matching lines @@
 MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
     : content_view_(content_view) {
   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_);
 
-  set_border(Border::CreateEmptyBorder(
-                 MenuConfig::instance().submenu_vertical_margin_size,
-                 MenuConfig::instance().submenu_horizontal_margin_size,
-                 MenuConfig::instance().submenu_vertical_margin_size,
-                 MenuConfig::instance().submenu_horizontal_margin_size));
+  MenuItemView* root = content_view_->GetMenuItem();
+  set_border(root->GetMenuBorder());
+  set_background(root->GetMenuBackground());
 }
 
 void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
   if (background()) {
     View::OnPaintBackground(canvas);
     return;
   }
 
 #if defined(OS_WIN)
   HDC dc = canvas->BeginPlatformPaint();
@@ skipping 55 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