summaryrefslogtreecommitdiffstats
path: root/ash/display/display_manager.cc
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2015-08-06 18:29:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 01:30:28 +0000
commitc4afb05f67511e980cd13c021abf26e04b902977 (patch)
tree125f79c7a354095c4519128b0fe2c9983f644152 /ash/display/display_manager.cc
parentac97e8e270e8783230272fa07d18d360d2409d5f (diff)
downloadchromium_src-c4afb05f67511e980cd13c021abf26e04b902977.zip
chromium_src-c4afb05f67511e980cd13c021abf26e04b902977.tar.gz
chromium_src-c4afb05f67511e980cd13c021abf26e04b902977.tar.bz2
Revert of Update SplitString calls to new form (patchset #5 id:80001 of https://codereview.chromium.org/1272823003/ )
Reason for revert: Caused Blink layout test failures in media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html : http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showExpectations=true&tests=media%2Fencrypted-media%2Fencrypted-media-requestmediakeysystemaccess.html Original issue's description: > Update SplitString calls to new form > > Uses the new form for most (but not quite all) of the remaining users of the old form. > > Changes media mime util codec list parsing to expect no result from the string "," rather than two empty strings. The old SplitString call had a special case where if the input was empty, it would return empty, but if it had one split character, it would return two empty strings as results. > > The new one lets you choose but the options are either (1) empty string -> one empty string and "," -> two empty strings, or (2) map both to no results for when you don't want empty results. I'm pretty sure media codec parsing actually wants the latter behavior, so I updated the call to discard empty results and MimeUtilTest.ParseCodecString is updated. > > Committed: https://crrev.com/0aa7c64253cca8b636d52d1d01d94f96ab9c13fa > Cr-Commit-Position: refs/heads/master@{#342238} TBR=sky@chromium.org,dalecurtis@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1278973003 Cr-Commit-Position: refs/heads/master@{#342257}
Diffstat (limited to 'ash/display/display_manager.cc')
-rw-r--r--ash/display/display_manager.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 6c0fca1..dba2e0a 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -171,9 +171,11 @@ bool DisplayManager::InitFromCommandLine() {
return false;
const string size_str =
command_line->GetSwitchValueASCII(switches::kAshHostWindowBounds);
- for (const std::string& part : base::SplitString(
- size_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
- info_list.push_back(DisplayInfo::CreateFromSpec(part));
+ vector<string> parts;
+ base::SplitString(size_str, ',', &parts);
+ for (vector<string>::const_iterator iter = parts.begin();
+ iter != parts.end(); ++iter) {
+ info_list.push_back(DisplayInfo::CreateFromSpec(*iter));
info_list.back().set_native(true);
}
MaybeInitInternalDisplay(&info_list[0]);