| Index: net/base/filename_util_internal.h
|
| diff --git a/net/base/filename_util_internal.h b/net/base/filename_util_internal.h
|
| index 0e6033439e0b138ae4fa9bc1500e19803b7b96a2..bc96a8e713e8c6121f1df72125ce8d4beadac6ea 100644
|
| --- a/net/base/filename_util_internal.h
|
| +++ b/net/base/filename_util_internal.h
|
| @@ -18,44 +18,22 @@ class GURL;
|
|
|
| namespace net {
|
|
|
| -typedef base::Callback<
|
| - void(base::FilePath::StringType* file_name, char replace_char)>
|
| - ReplaceIllegalCharactersCallback;
|
| +extern const char kReplacement;
|
|
|
| -void SanitizeGeneratedFileName(base::FilePath::StringType* filename,
|
| - bool replace_trailing);
|
| -
|
| -bool IsShellIntegratedExtension(const base::FilePath::StringType& extension);
|
| -
|
| -bool IsReservedName(const base::FilePath::StringType& filename);
|
| -
|
| -void EnsureSafeExtension(const std::string& mime_type,
|
| - bool ignore_extension,
|
| - base::FilePath* file_name);
|
| -
|
| -bool FilePathToString16(const base::FilePath& path, base::string16* converted);
|
| -
|
| -// Similar to GetSuggestedFilename(), but takes callback to replace illegal
|
| -// characters.
|
| -base::string16 GetSuggestedFilenameImpl(
|
| +// See documentation at filename_util_internal.cc
|
| +std::string SelectUnsafeDownloadFilename(
|
| const GURL& url,
|
| const std::string& content_disposition,
|
| const std::string& referrer_charset,
|
| const std::string& suggested_name,
|
| const std::string& mime_type,
|
| const std::string& default_name,
|
| - ReplaceIllegalCharactersCallback replace_illegal_characters_callback);
|
| + ExtensionGenerationOption* extension_option);
|
|
|
| -// Similar to GenerateFileName(), but takes callback to replace illegal
|
| -// characters.
|
| -base::FilePath GenerateFileNameImpl(
|
| - const GURL& url,
|
| - const std::string& content_disposition,
|
| - const std::string& referrer_charset,
|
| - const std::string& suggested_name,
|
| - const std::string& mime_type,
|
| - const std::string& default_name,
|
| - ReplaceIllegalCharactersCallback replace_illegal_characters_callback);
|
| +// See documentation at filename_util_internal.cc
|
| +void EnsureSafeFilenameInternal(const std::string& mime_type,
|
| + ExtensionGenerationOption option,
|
| + base::FilePath* filename);
|
|
|
| } // namespace net
|
|
|
|
|