ui/views/controls/combobox/combobox.cc - Issue 24883002: Uses and returns the fractional width in text eliding

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/combobox/combobox.cc

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix win bots Created 7 years, 3 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: ui/views/controls/combobox/combobox.cc

diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc

index 8ef7b365e75a6d932447754a7c08f184a3f18e29..e53880b983b4544af80cfb0ef1bcb3e52f0749a9 100644

--- a/ui/views/controls/combobox/combobox.cc

+++ b/ui/views/controls/combobox/combobox.cc

@@ -349,7 +349,7 @@ void Combobox::UpdateFromModel() {

base::i18n::AdjustStringForLocaleDirection(&text);

menu->AppendMenuItem(i + kFirstMenuItemId, text, MenuItemView::NORMAL);

- max_width = std::max(max_width, font.GetStringWidth(text));

+ max_width = std::max<int>(max_width, font.GetStringWidth(text));

}

content_size_.SetSize(max_width, font.GetHeight());