Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: ui/views/controls/prefix_selector_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/prefix_selector.cc ('k') | ui/views/controls/progress_bar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/prefix_selector_unittest.cc
diff --git a/ui/views/controls/prefix_selector_unittest.cc b/ui/views/controls/prefix_selector_unittest.cc
index c39e6cc652afb0bf203cfef02dc5e5f8cdd8a83b..14356dfa5606b49cc5a32796e7e27f9547087e79 100644
--- a/ui/views/controls/prefix_selector_unittest.cc
+++ b/ui/views/controls/prefix_selector_unittest.cc
@@ -36,12 +36,12 @@ class TestPrefixDelegate : public PrefixDelegate {
selected_row_ = row;
}
- virtual string16 GetTextForRow(int row) OVERRIDE {
+ virtual base::string16 GetTextForRow(int row) OVERRIDE {
return rows_[row];
}
private:
- std::vector<string16> rows_;
+ std::vector<base::string16> rows_;
int selected_row_;
DISALLOW_COPY_AND_ASSIGN(TestPrefixDelegate);
« no previous file with comments | « ui/views/controls/prefix_selector.cc ('k') | ui/views/controls/progress_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698