ui/base/text/text_elider.cc - Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_...

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: ui/base/text/text_elider.cc

Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 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

Index: ui/base/text/text_elider.cc

===================================================================

--- ui/base/text/text_elider.cc (revision 82762)

+++ ui/base/text/text_elider.cc (working copy)

@@ -391,10 +391,8 @@

SortedDisplayURL::SortedDisplayURL(const GURL& url,

const std::string& languages) {

- std::wstring host;

- net::AppendFormattedHost(url, UTF8ToWide(languages), &host, NULL, NULL);

- sort_host_ = WideToUTF16Hack(host);

- string16 host_minus_www = net::StripWWW(WideToUTF16Hack(host));

+ net::AppendFormattedHost(url, languages, &sort_host_);

+ string16 host_minus_www = net::StripWWW(sort_host_);

url_parse::Parsed parsed;

display_url_ = net::FormatUrl(url, languages,

net::kFormatUrlOmitAll, UnescapeRule::SPACES, &parsed, &prefix_end_,

« net/base/net_util_unittest.cc ('K') | « net/base/sdch_manager.cc ('k') | no next file » | no next file with comments »