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

Unified Diff: chrome/utility/importer/bookmark_html_reader.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
« no previous file with comments | « chrome/tools/convert_dict/aff_reader.cc ('k') | chrome/utility/importer/ie_importer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/bookmark_html_reader.cc
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
index 1350512d4dd1d0134ef6b910d48d38f77f2a48aa..59048e238b19ebc100b219c08fce2866dd04e9bf 100644
--- a/chrome/utility/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.cc
@@ -96,8 +96,8 @@ void ImportBookmarksFile(
favicon_base::FaviconUsageDataList* favicons) {
std::string content;
base::ReadFileToString(file_path, &content);
- std::vector<std::string> lines;
- base::SplitString(content, '\n', &lines);
+ std::vector<std::string> lines = base::SplitString(
+ content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
base::string16 last_folder;
bool last_folder_on_toolbar = false;
« no previous file with comments | « chrome/tools/convert_dict/aff_reader.cc ('k') | chrome/utility/importer/ie_importer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698