summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/display/display_preferences.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-07-21 14:37:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 21:38:12 +0000
commitc6f82b158f374c172a46326699f03d97777faa8e (patch)
treec96472fa185ca20b22fad773cd195689e4097894 /chrome/browser/chromeos/display/display_preferences.cc
parentdb484c3eff68c46ddf1530dd60441dba4614cb5c (diff)
downloadchromium_src-c6f82b158f374c172a46326699f03d97777faa8e.zip
chromium_src-c6f82b158f374c172a46326699f03d97777faa8e.tar.gz
chromium_src-c6f82b158f374c172a46326699f03d97777faa8e.tar.bz2
Update SplitString calls in chrome.
In many places that iterated over the results, the code was changed to use a range-based for loop over the result of the SplitStirng call. Review URL: https://codereview.chromium.org/1240183002 Cr-Commit-Position: refs/heads/master@{#339753}
Diffstat (limited to 'chrome/browser/chromeos/display/display_preferences.cc')
-rw-r--r--chrome/browser/chromeos/display/display_preferences.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index b046013..8d0dea9 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -121,8 +121,8 @@ void LoadDisplayLayouts() {
}
if (it.key().find(",") != std::string::npos) {
- std::vector<std::string> ids;
- base::SplitString(it.key(), ',', &ids);
+ std::vector<std::string> ids = base::SplitString(
+ it.key(), ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
int64 id1 = gfx::Display::kInvalidDisplayID;
int64 id2 = gfx::Display::kInvalidDisplayID;
if (!base::StringToInt64(ids[0], &id1) ||