views/controls/menu/menu_item_view.h - Issue 7331017: Multi-Profiles: Add icon chooser to profiles menu

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: views/controls/menu/menu_item_view.h

Issue 7331017: Multi-Profiles: Add icon chooser to profiles menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments Created 9 years, 5 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:

Index: views/controls/menu/menu_item_view.h

diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h

index 9f5c9b3282508fc48d10deaa9a390716f2786fa7..3f952f717c2a879f8cc0c04f517fc9aa28ead0cf 100644

--- a/views/controls/menu/menu_item_view.h

+++ b/views/controls/menu/menu_item_view.h

@@ -406,8 +406,8 @@ class MenuItemView : public View {

int GetTopMargin();

int GetBottomMargin();

- // Returns the preferred width (and padding) of any children.

- int GetChildPreferredWidth();

+ // Returns the preferred size (and padding) of any children.

+ gfx::Size GetChildPreferredSize();

// Calculates the preferred size.

gfx::Size CalculatePreferredSize();