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 /chrome/browser/net/url_fixer_upper.cc | |
| 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 'chrome/browser/net/url_fixer_upper.cc')
| -rw-r--r-- | chrome/browser/net/url_fixer_upper.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 486556b..2e025fc 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -173,7 +173,7 @@ static std::string FixupPath(const std::string& text) { GURL file_url = net::FilePathToFileURL(FilePath(filename)); if (file_url.is_valid()) { return UTF16ToUTF8(net::FormatUrl(file_url, std::string(), - net::kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL, + net::kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, NULL, NULL, NULL)); } @@ -550,11 +550,11 @@ GURL URLFixerUpper::FixupRelativeFile(const FilePath& base_dir, #if defined(OS_WIN) std::wstring unescaped = UTF8ToWide(net::UnescapeURLComponent( WideToUTF8(trimmed), - UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS)); + net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS)); #elif defined(OS_POSIX) std::string unescaped = net::UnescapeURLComponent( trimmed, - UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS); + net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS); #endif if (!ValidPathForFile(unescaped, &full_path)) @@ -569,7 +569,7 @@ GURL URLFixerUpper::FixupRelativeFile(const FilePath& base_dir, GURL file_url = net::FilePathToFileURL(full_path); if (file_url.is_valid()) return GURL(UTF16ToUTF8(net::FormatUrl(file_url, std::string(), - net::kFormatUrlOmitUsernamePassword, UnescapeRule::NORMAL, NULL, + net::kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, NULL, NULL, NULL))); // Invalid files fall through to regular processing. } |