| 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 18 matching lines...) Expand all Loading... |
| 29 url_string.push_back(base::FilePath::kSeparators[0]); | 29 url_string.push_back(base::FilePath::kSeparators[0]); |
| 30 } | 30 } |
| 31 url_string.append(path.value()); | 31 url_string.append(path.value()); |
| 32 | 32 |
| 33 // Now do replacement of some characters. Since we assume the input is a | 33 // Now do replacement of some characters. Since we assume the input is a |
| 34 // literal filename, anything the URL parser might consider special should | 34 // literal filename, anything the URL parser might consider special should |
| 35 // be escaped here. | 35 // be escaped here. |
| 36 | 36 |
| 37 // This must be the first substitution since others will introduce percents as | 37 // This must be the first substitution since others will introduce percents as |
| 38 // the escape character | 38 // the escape character |
| 39 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("%"), | 39 base::ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("%"), |
| 40 FILE_PATH_LITERAL("%25")); | 40 FILE_PATH_LITERAL("%25")); |
| 41 | 41 |
| 42 // A semicolon is supposed to be some kind of separator according to RFC 2396. | 42 // A semicolon is supposed to be some kind of separator according to RFC 2396. |
| 43 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL(";"), | 43 base::ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL(";"), |
| 44 FILE_PATH_LITERAL("%3B")); | 44 FILE_PATH_LITERAL("%3B")); |
| 45 | 45 |
| 46 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("#"), | 46 base::ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("#"), |
| 47 FILE_PATH_LITERAL("%23")); | 47 FILE_PATH_LITERAL("%23")); |
| 48 | 48 |
| 49 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("?"), | 49 base::ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("?"), |
| 50 FILE_PATH_LITERAL("%3F")); | 50 FILE_PATH_LITERAL("%3F")); |
| 51 | 51 |
| 52 ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("\\"), | 52 base::ReplaceSubstringsAfterOffset(&url_string, 0, FILE_PATH_LITERAL("\\"), |
| 53 FILE_PATH_LITERAL("%5C")); | 53 FILE_PATH_LITERAL("%5C")); |
| 54 | 54 |
| 55 return GURL(url_string); | 55 return GURL(url_string); |
| 56 } | 56 } |
| 57 | 57 |
| 58 GURL AddTrailingSlashIfNeeded(const GURL& url) { | 58 GURL AddTrailingSlashIfNeeded(const GURL& url) { |
| 59 if (!url.has_path() || *url.path().rbegin() == '/') | 59 if (!url.has_path() || *url.path().rbegin() == '/') |
| 60 return url; | 60 return url; |
| 61 | 61 |
| 62 std::string path(url.path() + '/'); | 62 std::string path(url.path() + '/'); |
| 63 GURL::Replacements replacements; | 63 GURL::Replacements replacements; |
| 64 replacements.SetPathStr(path); | 64 replacements.SetPathStr(path); |
| 65 return url.ReplaceComponents(replacements); | 65 return url.ReplaceComponents(replacements); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace shell | 68 } // namespace shell |
| OLD | NEW |