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

Unified Diff: content/renderer/manifest/manifest_parser.cc

Issue 1278973003: Revert of Update SplitString calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | content/renderer/media/webrtc/stun_field_trial.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/manifest/manifest_parser.cc
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 780cf91a32017abab3f617228292966d58195818..6b021d2a7a30286f1cbd292e161a3c5e5f495f71 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -48,9 +48,8 @@
std::vector<gfx::Size> sizes;
std::string sizes_str =
base::StringToLowerASCII(base::UTF16ToUTF8(sizes_str16));
- std::vector<std::string> sizes_str_list = base::SplitString(
- sizes_str, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
- base::SPLIT_WANT_NONEMPTY);
+ std::vector<std::string> sizes_str_list;
+ base::SplitStringAlongWhitespace(sizes_str, &sizes_str_list);
for (size_t i = 0; i < sizes_str_list.size(); ++i) {
std::string& size_str = sizes_str_list[i];
@@ -60,8 +59,8 @@
}
// It is expected that [0] => width and [1] => height after the split.
- std::vector<std::string> size_list = base::SplitString(
- size_str, "x", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
+ std::vector<std::string> size_list;
+ base::SplitStringDontTrim(size_str, L'x', &size_list);
if (size_list.size() != 2)
continue;
if (!IsValidIconWidthOrHeight(size_list[0]) ||
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | content/renderer/media/webrtc/stun_field_trial.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698