| Index: content/browser/download/drag_download_util.cc
|
| diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
|
| index f9ca5fefc9721e718759a50ff586ff4566107b53..d275702ec1946069a637b6a006b7907b8658ce63 100644
|
| --- a/content/browser/download/drag_download_util.cc
|
| +++ b/content/browser/download/drag_download_util.cc
|
| @@ -25,7 +25,7 @@ namespace content {
|
|
|
| bool ParseDownloadMetadata(const string16& metadata,
|
| string16* mime_type,
|
| - FilePath* file_name,
|
| + base::FilePath* file_name,
|
| GURL* url) {
|
| const char16 separator = L':';
|
|
|
| @@ -47,9 +47,9 @@ bool ParseDownloadMetadata(const string16& metadata,
|
| string16 file_name_str = metadata.substr(
|
| mime_type_end_pos + 1, file_name_end_pos - mime_type_end_pos - 1);
|
| #if defined(OS_WIN)
|
| - *file_name = FilePath(file_name_str);
|
| + *file_name = base::FilePath(file_name_str);
|
| #else
|
| - *file_name = FilePath(UTF16ToUTF8(file_name_str));
|
| + *file_name = base::FilePath(UTF16ToUTF8(file_name_str));
|
| #endif
|
| }
|
| if (url)
|
| @@ -58,13 +58,14 @@ bool ParseDownloadMetadata(const string16& metadata,
|
| return true;
|
| }
|
|
|
| -FileStream* CreateFileStreamForDrop(FilePath* file_path, net::NetLog* net_log) {
|
| +FileStream* CreateFileStreamForDrop(base::FilePath* file_path,
|
| + net::NetLog* net_log) {
|
| DCHECK(file_path && !file_path->empty());
|
|
|
| scoped_ptr<FileStream> file_stream(new FileStream(net_log));
|
| const int kMaxSeq = 99;
|
| for (int seq = 0; seq <= kMaxSeq; seq++) {
|
| - FilePath new_file_path;
|
| + base::FilePath new_file_path;
|
| if (seq == 0) {
|
| new_file_path = *file_path;
|
| } else {
|
| @@ -97,7 +98,8 @@ PromiseFileFinalizer::PromiseFileFinalizer(
|
| : drag_file_downloader_(drag_file_downloader) {
|
| }
|
|
|
| -void PromiseFileFinalizer::OnDownloadCompleted(const FilePath& file_path) {
|
| +void PromiseFileFinalizer::OnDownloadCompleted(
|
| + const base::FilePath& file_path) {
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| base::Bind(&PromiseFileFinalizer::Cleanup, this));
|
|
|