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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11088037: Revert 160886 - Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuCo… (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_item_view_views.cc ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view_win.cc
===================================================================
--- ui/views/controls/menu/menu_item_view_win.cc (revision 160892)
+++ ui/views/controls/menu/menu_item_view_win.cc (working copy)
@@ -18,7 +18,7 @@
namespace views {
void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
- const MenuConfig& config = GetMenuConfig();
+ const MenuConfig& config = MenuConfig::instance();
bool render_selection =
(mode == PB_NORMAL && IsSelected() &&
@@ -140,7 +140,7 @@
}
int top_margin = GetTopMargin();
- int icon_x = GetMenuConfig().item_left_margin;
+ int icon_x = MenuConfig::instance().item_left_margin;
int icon_y = top_margin +
(height() - top_margin - GetBottomMargin() - icon_height) / 2;
NativeTheme::ExtraParams extra;
« no previous file with comments | « ui/views/controls/menu/menu_item_view_views.cc ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698