Changed action box menu background and border to match the rest of the menus

BUG=125307

Review URL: https://chromiumcodereview.appspot.com/11227028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163469 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 32 deletions

diff --git a/ui/views/controls/menu/menu_delegate.cc b/ui/views/controls/menu/menu_delegate.cc
index c2cfcd2..6e529a6 100644
--- a/ui/views/controls/menu/menu_delegate.cc
+++ b/ui/views/controls/menu/menu_delegate.cc
@@ -127,12 +127,4 @@ void MenuDelegate::WillShowMenu(MenuItemView* menu) {
 void MenuDelegate::WillHideMenu(MenuItemView* menu) {
 }
 
-Border* MenuDelegate::CreateMenuBorder() {
-  return NULL;
-}
-
-Background* MenuDelegate::CreateMenuBackground() {
-  return NULL;
-}
-
 }  // namespace views
diff --git a/ui/views/controls/menu/menu_delegate.h b/ui/views/controls/menu/menu_delegate.h
index 2be1925..78bc7c1 100644
--- a/ui/views/controls/menu/menu_delegate.h
+++ b/ui/views/controls/menu/menu_delegate.h
@@ -200,14 +200,6 @@ class VIEWS_EXPORT MenuDelegate {
 
   // Invoked prior to a menu being hidden.
   virtual void WillHideMenu(MenuItemView* menu);
-
-  // Creates and returns a new border for the menu, or NULL if no border is
-  // needed. Caller owns the returned object.
-  virtual Border* CreateMenuBorder();
-
-  // Creates and returns a new background for the menu, or NULL if no
-  // background is needed. Caller owns the returned object.
-  virtual Background* CreateMenuBackground();
 };
 
 }  // namespace views
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index ec7937b..5b829c9 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -183,22 +183,13 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
   scroll_view_ = new MenuScrollView(content_view);
   AddChildView(scroll_view_);
 
-  MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate();
-  if (delegate) {
-    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());
-  }
+  const MenuConfig& menu_config =
+      content_view_->GetMenuItem()->GetMenuConfig();
+  set_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));
 }
 
 void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {