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

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 1240183002: Update SplitString calls in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index e19c8ff6e1b94728f3224a9b587ccc05f16332aa..848c82526dc797d24db25c9e4e202a86bd361b81 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -553,9 +553,10 @@ void Preferences::ApplyPreferences(ApplyReason reason,
std::string value(enabled_extension_imes_.GetValue());
std::vector<std::string> split_values;
- if (!value.empty())
- base::SplitString(value, ',', &split_values);
-
+ if (!value.empty()) {
+ split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
+ }
ime_state_->SetEnabledExtensionImes(&split_values);
}
@@ -622,8 +623,10 @@ void Preferences::SetLanguageConfigStringListAsCSV(const char* section,
VLOG(1) << "Setting " << name << " to '" << value << "'";
std::vector<std::string> split_values;
- if (!value.empty())
- base::SplitString(value, ',', &split_values);
+ if (!value.empty()) {
+ split_values = base::SplitString(value, ",", base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
+ }
// Transfers the xkb id to extension-xkb id.
if (input_method_manager_->MigrateInputMethods(&split_values))
« no previous file with comments | « chrome/browser/chromeos/power/peripheral_battery_observer.cc ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698