chrome/utility/importer/bookmark_html_reader.cc - Issue 1119453003: [Importer] Allow Chrome to import bookmark files without a charset specified.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/utility/importer/bookmark_html_reader.cc

Issue 1119453003: [Importer] Allow Chrome to import bookmark files without a charset specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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/test/data/bookmark_html_reader/ie_sans_charset.html ('k') | chrome/utility/importer/bookmark_html_reader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 2ba117152feaaeb611d46a51671262101fcff680..eed15fa1fbd53f0efa22bce30d940cd36a4e0c2d 100644

--- a/chrome/utility/importer/bookmark_html_reader.cc

+++ b/chrome/utility/importer/bookmark_html_reader.cc

@@ -106,7 +106,7 @@ void ImportBookmarksFile(

base::Time last_folder_add_date;

std::vector<base::string16> path;

size_t toolbar_folder_index = 0;

- std::string charset;

+ std::string charset = "UTF-8"; // If no charset is specified, assume utf-8.

for (size_t i = 0;

i < lines.size() &&

(cancellation_callback.is_null() || !cancellation_callback.Run());