chrome/renderer/localized_error.cc - Issue 6317016: Change UTF8ToUTF16 to accept const StringPiece&.

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/renderer/localized_error.cc

Issue 6317016: Change UTF8ToUTF16 to accept const StringPiece&. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 9 years, 11 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:

Index: chrome/renderer/localized_error.cc

diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc

index 7b4ae31dd8ebc0d6899ec4811e5de1a7444acc44..88212672455f9d11e1c0976d5ac9643936bacb7d 100644

--- a/chrome/renderer/localized_error.cc

+++ b/chrome/renderer/localized_error.cc

@@ -355,7 +355,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,

l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING));

}

- string16 failed_url(ASCIIToUTF16(error.unreachableURL.spec()));

+ string16 failed_url(ASCIIToUTF16(std::string(error.unreachableURL.spec())));

// URLs are always LTR.

if (rtl)

base::i18n::WrapStringWithLTRFormatting(&failed_url);