ui/views/controls/combobox/combobox.cc - Issue 26540004: Return blank strings for Views Combobox separator items.

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 26540004: Return blank strings for Views Combobox separator items. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Upload again to kick the CQ. Created 7 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:

Index: ui/views/controls/combobox/combobox.cc

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

index 5c414d0da42b16f3326fc798a7b4fa7537ad94c2..805af3b42ac82f8b175954b9c391697decc55a59 100644

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

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

@@ -178,7 +178,7 @@ void Combobox::SetSelectedRow(int row) {

}

string16 Combobox::GetTextForRow(int row) {

- return model()->GetItemAt(row);

+ return model()->IsItemSeparatorAt(row) ? string16() : model()->GetItemAt(row);

}

////////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « no previous file | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »