Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(827)

Unified Diff: net/base/net_util.cc

Issue 7811006: Add full support for filesystem URLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge errors Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/mime_sniffer.cc ('k') | ui/base/text/text_elider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util.cc
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 29b83a8a4ca8a667dc780adb69544f15d838ac22..f2d22aefbee2770a60577db2144b23d315b4de66 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) {
« no previous file with comments | « net/base/mime_sniffer.cc ('k') | ui/base/text/text_elider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698