From c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 10 Apr 2014 11:22:14 +0100 Subject: Merge from Chromium at DEPS revision 262940 This commit was generated by merge_to_master.py. Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1 --- content/browser/download/drag_download_util.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'content/browser/download/drag_download_util.h') diff --git a/content/browser/download/drag_download_util.h b/content/browser/download/drag_download_util.h index ca266efa62..76b4e61068 100644 --- a/content/browser/download/drag_download_util.h +++ b/content/browser/download/drag_download_util.h @@ -6,6 +6,7 @@ #define CONTENT_BROWSER_DOWNLOAD_DRAG_DOWNLOAD_UTIL_H_ #include "base/basictypes.h" +#include "base/files/file.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "content/browser/download/drag_download_file.h" @@ -17,10 +18,6 @@ namespace base { class FilePath; } -namespace net { -class FileStream; -} - namespace content { // Parse the download metadata set in DataTransfer.setData. The metadata @@ -39,10 +36,8 @@ bool ParseDownloadMetadata(const base::string16& metadata, // Create a new file at the specified path. If the file already exists, try to // insert the sequential unifier to produce a new file, like foo-01.txt. -// Return a FileStream if successful. -// |net_log| is a NetLog for the stream. -CONTENT_EXPORT net::FileStream* CreateFileStreamForDrop( - base::FilePath* file_path, net::NetLog* net_log); +// Return a File if successful. +CONTENT_EXPORT base::File CreateFileForDrop(base::FilePath* file_path); // Implementation of DownloadFileObserver to finalize the download process. class PromiseFileFinalizer : public ui::DownloadFileObserver { -- cgit v1.2.3