diff options
Diffstat (limited to 'app/gfx/text_elider.cc')
| -rw-r--r-- | app/gfx/text_elider.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/gfx/text_elider.cc b/app/gfx/text_elider.cc index a1db1c6..dc9b199 100644 --- a/app/gfx/text_elider.cc +++ b/app/gfx/text_elider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,8 +33,8 @@ std::wstring ElideUrl(const GURL& url, const std::wstring& languages) { // Get a formatted string and corresponding parsing of the url. url_parse::Parsed parsed; - std::wstring url_string = - net::FormatUrl(url, languages, true, UnescapeRule::SPACES, &parsed, NULL); + std::wstring url_string = net::FormatUrl(url, languages, true, + UnescapeRule::SPACES, &parsed, NULL, NULL); if (available_pixel_width <= 0) return url_string; @@ -334,12 +334,12 @@ std::wstring ElideText(const std::wstring& text, SortedDisplayURL::SortedDisplayURL(const GURL& url, const std::wstring& languages) { std::wstring host; - net::AppendFormattedHost(url, languages, &host, NULL); + net::AppendFormattedHost(url, languages, &host, NULL, NULL); sort_host_ = WideToUTF16Hack(host); string16 host_minus_www = WideToUTF16Hack(net::StripWWW(host)); url_parse::Parsed parsed; display_url_ = WideToUTF16Hack(net::FormatUrl(url, languages, - true, UnescapeRule::SPACES, &parsed, &prefix_end_)); + true, UnescapeRule::SPACES, &parsed, &prefix_end_, NULL)); if (sort_host_.length() > host_minus_www.length()) { prefix_end_ += sort_host_.length() - host_minus_www.length(); sort_host_.swap(host_minus_www); |