| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "shell/filename_util.h" | 5 #include "shell/filename_util.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 // A semicolon is supposed to be some kind of separator according to RFC 2396. | 43 // A semicolon is supposed to be some kind of separator according to RFC 2396. |
| 44 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL(";"), | 44 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL(";"), |
| 45 FILE_PATH_LITERAL("%3B")); | 45 FILE_PATH_LITERAL("%3B")); |
| 46 | 46 |
| 47 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("#"), | 47 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("#"), |
| 48 FILE_PATH_LITERAL("%23")); | 48 FILE_PATH_LITERAL("%23")); |
| 49 | 49 |
| 50 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("?"), | 50 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("?"), |
| 51 FILE_PATH_LITERAL("%3F")); | 51 FILE_PATH_LITERAL("%3F")); |
| 52 | 52 |
| 53 #if defined(OS_POSIX) | |
| 54 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("\\"), | 53 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("\\"), |
| 55 FILE_PATH_LITERAL("%5C")); | 54 FILE_PATH_LITERAL("%5C")); |
| 56 #endif | |
| 57 | 55 |
| 58 return GURL(url_string); | 56 return GURL(url_string); |
| 59 } | 57 } |
| 60 | 58 |
| 61 GURL AddTrailingSlashIfNeeded(const GURL& url) { | 59 GURL AddTrailingSlashIfNeeded(const GURL& url) { |
| 62 if (!url.has_path() || *url.path().rbegin() == '/') | 60 if (!url.has_path() || *url.path().rbegin() == '/') |
| 63 return url; | 61 return url; |
| 64 | 62 |
| 65 std::string path(url.path() + '/'); | 63 std::string path(url.path() + '/'); |
| 66 GURL::Replacements replacements; | 64 GURL::Replacements replacements; |
| 67 replacements.SetPathStr(path); | 65 replacements.SetPathStr(path); |
| 68 return url.ReplaceComponents(replacements); | 66 return url.ReplaceComponents(replacements); |
| 69 } | 67 } |
| 70 | 68 |
| 71 } // namespace shell | 69 } // namespace shell |
| 72 } // namespace mojo | 70 } // namespace mojo |
| OLD | NEW |