diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 04:49:56 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 04:49:56 +0000 |
| commit | 1f659d97e4656f09c800f6432d50ac06d91b0aac (patch) | |
| tree | 81b0fb5b20c43edc74c3dfdd14af9cf4c6957723 /net | |
| parent | 4743dadd60796ed4462c44ac4c8cc27673c8e6e6 (diff) | |
| download | chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.zip chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.tar.gz chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.tar.bz2 | |
Convert a bunch of uses of the wstring net::FormatUrl() to the new string16 one.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3287002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/base/net_util.h b/net/base/net_util.h index f1dadc7..a3bea0d 100644 --- a/net/base/net_util.h +++ b/net/base/net_util.h @@ -315,10 +315,15 @@ string16 FormatUrl(const GURL& url, // format_types = kFormatUrlOmitAll and unescape = SPACES. This is the typical // set of flags for "URLs to display to the user". You should be cautious about // using this for URLs which will be parsed or sent to other applications. +// TODO(viettrungluu): remove wstring version. inline std::wstring FormatUrl(const GURL& url, const std::wstring& languages) { return FormatUrl(url, languages, kFormatUrlOmitAll, UnescapeRule::SPACES, NULL, NULL, NULL); } +inline string16 FormatUrl(const GURL& url, const std::string& languages) { + return FormatUrl(url, languages, kFormatUrlOmitAll, UnescapeRule::SPACES, + NULL, NULL, NULL); +} // Returns whether FormatUrl() would strip a trailing slash from |url|, given a // format flag including kFormatUrlOmitTrailingSlashOnBareHostname. |