diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 20:03:50 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 20:03:50 +0000 |
| commit | 04866c4c67566d17cdea2e72eb90a6ec79db1a8b (patch) | |
| tree | 0e14e8c1fa5bd77b6cba9b44b110426ec596be57 /ui | |
| parent | 623fe74c6c07104c2f09b9822af47813a81d2f1f (diff) | |
| download | chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.zip chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.tar.gz chromium_src-04866c4c67566d17cdea2e72eb90a6ec79db1a8b.tar.bz2 | |
Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_util.h, and reduce the API surfaces in various places slightly where possible.
BUG=23581
TEST=none
Review URL: http://codereview.chromium.org/6898026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/text/text_elider.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index 7f7a727..a04736e 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -391,10 +391,8 @@ string16 ElideText(const string16& text, 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_, |