diff options
| author | brettw <brettw@chromium.org> | 2015-07-23 16:23:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-23 23:25:00 +0000 |
| commit | 8be197d144c267c6a7c1b207a41267ac6c971712 (patch) | |
| tree | 22d99a93dc2f060d8637abbea5fcc869cc602686 /components/translate/core/browser/translate_prefs.cc | |
| parent | a36acb95c375d4de17277cadbe8d56b45a80d5ce (diff) | |
| download | chromium_src-8be197d144c267c6a7c1b207a41267ac6c971712.zip chromium_src-8be197d144c267c6a7c1b207a41267ac6c971712.tar.gz chromium_src-8be197d144c267c6a7c1b207a41267ac6c971712.tar.bz2 | |
Update SplitString calls in components
This converts calls from the old form to the new form. Some calls that iterated over the results were changed to a range-based for loop with an inline call to SplitString. Some places were changed to use StringPieces when it was safe to do so.
Review URL: https://codereview.chromium.org/1234973004
Cr-Commit-Position: refs/heads/master@{#340209}
Diffstat (limited to 'components/translate/core/browser/translate_prefs.cc')
| -rw-r--r-- | components/translate/core/browser/translate_prefs.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc index 571241a..0a7989de 100644 --- a/components/translate/core/browser/translate_prefs.cc +++ b/components/translate/core/browser/translate_prefs.cc @@ -79,8 +79,8 @@ void ExpandLanguageCodes(const std::vector<std::string>& languages, seen.insert(language); } - std::vector<std::string> tokens; - base::SplitString(language, '-', &tokens); + std::vector<std::string> tokens = base::SplitString( + language, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (tokens.size() == 0) continue; const std::string& main_part = tokens[0]; @@ -319,8 +319,8 @@ void TranslatePrefs::GetLanguageList(std::vector<std::string>* languages) { const char* key = accept_languages_pref_.c_str(); #endif - std::string languages_str = prefs_->GetString(key); - base::SplitString(languages_str, ',', languages); + *languages = base::SplitString(prefs_->GetString(key), ",", + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); } void TranslatePrefs::UpdateLanguageList( @@ -449,10 +449,9 @@ void TranslatePrefs::MigrateUserPrefs(PrefService* user_prefs, std::vector<std::string> blacklisted_languages; GetBlacklistedLanguages(user_prefs, &blacklisted_languages); - std::string accept_languages_str = - user_prefs->GetString(accept_languages_pref); - std::vector<std::string> accept_languages; - base::SplitString(accept_languages_str, ',', &accept_languages); + std::vector<std::string> accept_languages = base::SplitString( + user_prefs->GetString(accept_languages_pref), ",", + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); std::vector<std::string> blocked_languages; CreateBlockedLanguages( |