diff options
| author | apavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 13:51:58 +0000 |
|---|---|---|
| committer | apavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 13:51:58 +0000 |
| commit | f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f (patch) | |
| tree | 74fb091262f2850a55aa99bbedcdaa163f0c09d1 /net/base/net_util.cc | |
| parent | bd070e2f0795ef0661be6be7585a62c81fbf7459 (diff) | |
| download | chromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.zip chromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.tar.gz chromium_src-f1f8639f531a3a919a13d8f8aa8008e8b88e3b1f.tar.bz2 | |
Reapply 130248 - Add full support for filesystem URLs. Trying to get the build into the right state.
TBR=pfeldman
Review URL: https://chromiumcodereview.appspot.com/9956101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 29b83a8..f2d22ae 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1908,8 +1908,9 @@ string16 FormatUrl(const GURL& url, bool CanStripTrailingSlash(const GURL& url) { // Omit the path only for standard, non-file URLs with nothing but "/" after // the hostname. - return url.IsStandard() && !url.SchemeIsFile() && !url.has_query() && - !url.has_ref() && url.path() == "/"; + return url.IsStandard() && !url.SchemeIsFile() && + !url.SchemeIsFileSystem() && !url.has_query() && !url.has_ref() + && url.path() == "/"; } GURL SimplifyUrlForRequest(const GURL& url) { |