ui/views/controls/combobox/combobox_unittest.cc - Issue 117983002: Prefix string16 with base:: in ui/.

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_unittest.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 7 years 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_unittest.cc

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

index 573fcb3025c947eb2bf34bb66cfad8ca8bf3249f..ec4cf85f80a6bafb2b15c7a71d522ac52b43bee0 100644

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

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

@@ -94,7 +94,7 @@ class TestComboboxModel : public ui::ComboboxModel {

virtual int GetItemCount() const OVERRIDE {

return 10;

}

- virtual string16 GetItemAt(int index) OVERRIDE {

+ virtual base::string16 GetItemAt(int index) OVERRIDE {

if (IsItemSeparatorAt(index)) {

NOTREACHED();

return ASCIIToUTF16("SEPARATOR");

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