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

Unified Diff: components/translate/core/browser/translate_accept_languages.cc

Issue 1234973004: Update SplitString calls in components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes 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_accept_languages.cc
diff --git a/components/translate/core/browser/translate_accept_languages.cc b/components/translate/core/browser/translate_accept_languages.cc
index 0a56713b46a60075a6dd117d224b0e3f3c7edee3..57eea1c877feda72979d6e582688fff8fa8abae2 100644
--- a/components/translate/core/browser/translate_accept_languages.cc
+++ b/components/translate/core/browser/translate_accept_languages.cc
@@ -62,22 +62,16 @@ void TranslateAcceptLanguages::InitAcceptLanguages(PrefService* prefs) {
DCHECK(prefs);
// Build the languages.
accept_languages_.clear();
- std::string accept_langs_str = prefs->GetString(
- accept_languages_pref_.c_str());
- std::vector<std::string> accept_langs_list;
- base::SplitString(accept_langs_str, ',', &accept_langs_list);
- std::vector<std::string>::const_iterator iter;
-
- for (iter = accept_langs_list.begin();
- iter != accept_langs_list.end(); ++iter) {
+ for (const base::StringPiece& lang : base::SplitStringPiece(
+ prefs->GetString(accept_languages_pref_), ",",
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
// Get rid of the locale extension if any (ex: en-US -> en), but for Chinese
// for which the CLD reports zh-CN and zh-TW.
- std::string accept_lang(*iter);
- size_t index = iter->find("-");
- if (index != std::string::npos && *iter != "zh-CN" && *iter != "zh-TW")
- accept_lang = iter->substr(0, index);
-
- accept_languages_.insert(accept_lang);
+ size_t index = lang.find('-');
+ if (index != base::StringPiece::npos && lang != "zh-CN" && lang != "zh-TW")
+ accept_languages_.insert(lang.substr(0, index).as_string());
+ else
+ accept_languages_.insert(lang.as_string());
}
}

Powered by Google App Engine
This is Rietveld 408576698