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

Unified Diff: components/search_engines/keyword_table.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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:
View side-by-side diff with in-line comments
Download patch
Index: components/search_engines/keyword_table.cc
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc
index 7de6217f23982008ea3e682f6b47eb4b3c3a466a..a4ad483fef68df75a7929912daaaa95177d2b537 100644
--- a/components/search_engines/keyword_table.cc
+++ b/components/search_engines/keyword_table.cc
@@ -80,7 +80,7 @@ const std::string ColumnsForVersion(int version, bool concatenated) {
columns.push_back("new_tab_url");
}
- return JoinString(columns, std::string(concatenated ? " || " : ", "));
+ return base::JoinString(columns, std::string(concatenated ? " || " : ", "));
}
@@ -115,7 +115,8 @@ void BindURLToStatement(const TemplateURLData& data,
std::string());
s->BindInt64(starting_column + 6, data.date_created.ToTimeT());
s->BindInt(starting_column + 7, data.usage_count);
- s->BindString(starting_column + 8, JoinString(data.input_encodings, ';'));
+ s->BindString(starting_column + 8,
+ base::JoinString(data.input_encodings, ";"));
s->BindBool(starting_column + 9, data.show_in_default_list);
s->BindString(starting_column + 10, data.suggestions_url);
s->BindInt(starting_column + 11, data.prepopulate_id);
« no previous file with comments | « components/search_engines/default_search_pref_migration_unittest.cc ('k') | components/search_engines/template_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698