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

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

Issue 11026076: Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it avail… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « ui/views/controls/menu/menu_separator_views.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_separator_win.cc
diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc
index edd06d59548e6429b4f1f41a565ee8398bca9ed1..d20549bbc04c4aac05c9c0d8137d1f18d617dd9f 100644
--- a/ui/views/controls/menu/menu_separator_win.cc
+++ b/ui/views/controls/menu/menu_separator_win.cc
@@ -17,7 +17,7 @@
namespace views {
void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
- const MenuConfig& config = MenuConfig::instance();
+ const MenuConfig& config = parent_menu_item_->GetMenuConfig();
// The gutter is rendered before the background.
int start_x = 0;
const ui::NativeTheme* theme = ui::NativeTheme::instance();
@@ -42,7 +42,7 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
gfx::Size MenuSeparator::GetPreferredSize() {
return gfx::Size(10, // Just in case we're the only item in a menu.
- MenuConfig::instance().separator_height);
+ parent_menu_item_->GetMenuConfig().separator_height);
}
} // namespace views
« no previous file with comments | « ui/views/controls/menu/menu_separator_views.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698