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

Unified Diff: components/translate/core/browser/translate_prefs.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/translate/core/browser/translate_prefs.cc
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index 768be0e8c691784dee5a583183a2bc48101e5d88..24547005fd11f9c947244da40725dbc8de87895a 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -326,7 +326,7 @@ void TranslatePrefs::GetLanguageList(std::vector<std::string>* languages) {
void TranslatePrefs::UpdateLanguageList(
const std::vector<std::string>& languages) {
#if defined(OS_CHROMEOS)
- std::string languages_str = JoinString(languages, ',');
+ std::string languages_str = base::JoinString(languages, ",");
prefs_->SetString(preferred_languages_pref_.c_str(), languages_str);
#endif
@@ -335,7 +335,7 @@ void TranslatePrefs::UpdateLanguageList(
// some web sites don't understand 'en-US' but 'en'. See crosbug.com/9884.
std::vector<std::string> accept_languages;
ExpandLanguageCodes(languages, &accept_languages);
- std::string accept_languages_str = JoinString(accept_languages, ',');
+ std::string accept_languages_str = base::JoinString(accept_languages, ",");
prefs_->SetString(accept_languages_pref_.c_str(), accept_languages_str);
}
@@ -485,7 +485,8 @@ void TranslatePrefs::MigrateUserPrefs(PrefService* user_prefs,
accept_languages.push_back(lang);
}
- std::string new_accept_languages_str = JoinString(accept_languages, ",");
+ std::string new_accept_languages_str =
+ base::JoinString(accept_languages, ",");
user_prefs->SetString(accept_languages_pref, new_accept_languages_str);
}
}
« no previous file with comments | « components/signin/core/browser/gaia_cookie_manager_service.cc ('k') | components/view_manager/gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698