Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Unified Diff: ui/views/controls/menu/menu_scroll_view_container.cc

Issue 10532171: Added support for icon views (view used instead of icon in a menu item). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added support for icon views (view used instead of icon in a menu item). Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/menu/menu_scroll_view_container.cc
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index 5d91d6dcaa03e15958e4582464a1cd2dd1ce34f3..0bc133e8d59ef99c307d0c61577a9ed484671b69 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -165,11 +165,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
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));
+ MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate();
+ if (delegate) {
+ set_border(delegate->CreateMenuBorder());
+ set_background(delegate->CreateMenuBackground());
+ }
}
void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
« ui/views/controls/menu/menu_item_view_win.cc ('K') | « ui/views/controls/menu/menu_item_view_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698