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

Unified Diff: ui/views/examples/table_example.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/examples/table_example.h ('k') | ui/views/examples/text_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/table_example.cc
diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc
index 87032c7160a0bd18c6d1ac5b7c6fb25960a059fa..fcd79d8af55d1911f7337c6d980659c2c1a7a44b 100644
--- a/ui/views/examples/table_example.cc
+++ b/ui/views/examples/table_example.cc
@@ -107,9 +107,9 @@ int TableExample::RowCount() {
return 10;
}
-string16 TableExample::GetText(int row, int column_id) {
+base::string16 TableExample::GetText(int row, int column_id) {
if (row == -1)
- return string16();
+ return base::string16();
const char* const cells[5][4] = {
{ "Orange", "Orange", "South america", "$5" },
« no previous file with comments | « ui/views/examples/table_example.h ('k') | ui/views/examples/text_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698