diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 14:58:21 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 14:58:21 +0000 |
| commit | b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69 (patch) | |
| tree | a42e9aab2c457c4018c0218afa7673460262dd08 /ui/base/text | |
| parent | be762d998ddb7f94f5192e373e9fd339eb3d5397 (diff) | |
| download | chromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.zip chromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.tar.gz chromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.tar.bz2 | |
net: Move UnescapeRule into the net namespace.
BUG=64263
TEST=None
R=willchan@chromium.org
Review URL: http://codereview.chromium.org/8552002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/text')
| -rw-r--r-- | ui/base/text/text_elider.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc index 1fa38d4..06212c2 100644 --- a/ui/base/text/text_elider.cc +++ b/ui/base/text/text_elider.cc @@ -118,7 +118,7 @@ string16 ElideUrl(const GURL& url, // Get a formatted string and corresponding parsing of the url. url_parse::Parsed parsed; string16 url_string = net::FormatUrl(url, languages, net::kFormatUrlOmitAll, - UnescapeRule::SPACES, &parsed, NULL, NULL); + net::UnescapeRule::SPACES, &parsed, NULL, NULL); if (available_pixel_width <= 0) return url_string; @@ -397,7 +397,7 @@ SortedDisplayURL::SortedDisplayURL(const GURL& url, 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::kFormatUrlOmitAll, net::UnescapeRule::SPACES, &parsed, &prefix_end_, NULL); if (sort_host_.length() > host_minus_www.length()) { prefix_end_ += sort_host_.length() - host_minus_www.length(); |