diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 19:40:01 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 19:40:01 +0000 |
| commit | 399377ec4249996564d863ea5e96020360fe1289 (patch) | |
| tree | 63c747b09c2136d330a0b66d182e63627992bd5e /ui/views/controls/menu/menu_delegate.cc | |
| parent | 5e40fc76cce289ae8943864f85a1503499727eee (diff) | |
| download | chromium_src-399377ec4249996564d863ea5e96020360fe1289.zip chromium_src-399377ec4249996564d863ea5e96020360fe1289.tar.gz chromium_src-399377ec4249996564d863ea5e96020360fe1289.tar.bz2 | |
Revert 160886 - Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it available.
BUG=125307
Review URL: https://chromiumcodereview.appspot.com/11026076
TBR=yefim@chromium.org
Review URL: https://codereview.chromium.org/11088037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/menu/menu_delegate.cc')
| -rw-r--r-- | ui/views/controls/menu/menu_delegate.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/views/controls/menu/menu_delegate.cc b/ui/views/controls/menu/menu_delegate.cc index c2cfcd2..392735b 100644 --- a/ui/views/controls/menu/menu_delegate.cc +++ b/ui/views/controls/menu/menu_delegate.cc @@ -128,7 +128,11 @@ void MenuDelegate::WillHideMenu(MenuItemView* menu) { } Border* MenuDelegate::CreateMenuBorder() { - return NULL; + return 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); } Background* MenuDelegate::CreateMenuBackground() { |