ui/views/controls/menu/menu_item_view_win.cc - Issue 11026076: Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it avail…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_item_view_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

« ui/views/controls/menu/menu_item_view.cc ('K') | « 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') | Hide Comments ('s')

Index: ui/views/controls/menu/menu_item_view_win.cc

diff --git a/ui/views/controls/menu/menu_item_view_win.cc b/ui/views/controls/menu/menu_item_view_win.cc

index 8589f21ac28fa5e87e2ea3cdee3c4290fb98f118..8abec06565c3fab8bcdb6520e3d5236c66ac2230 100644

--- a/ui/views/controls/menu/menu_item_view_win.cc

+++ b/ui/views/controls/menu/menu_item_view_win.cc

@@ -18,7 +18,7 @@ using ui::NativeTheme;

namespace views {

void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {

- const MenuConfig& config = MenuConfig::instance();

+ const MenuConfig& config = GetMenuConfig();

bool render_selection =

(mode == PB_NORMAL && IsSelected() &&

@@ -140,7 +140,7 @@ void MenuItemView::PaintCheck(gfx::Canvas* canvas,

}

int top_margin = GetTopMargin();

- int icon_x = MenuConfig::instance().item_left_margin;

+ int icon_x = GetMenuConfig().item_left_margin;

int icon_y = top_margin +

(height() - top_margin - GetBottomMargin() - icon_height) / 2;

NativeTheme::ExtraParams extra;