diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 23:58:23 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 23:58:23 +0000 |
| commit | f311bd71f1defeb33ec4903593e23061a913f992 (patch) | |
| tree | d3dd7f2422d41b15946002bf582b07f919475046 /net/url_request/url_request_ftp_job.cc | |
| parent | 5dce90240ecb2259290cd3aa12294b832b09eee9 (diff) | |
| download | chromium_src-f311bd71f1defeb33ec4903593e23061a913f992.zip chromium_src-f311bd71f1defeb33ec4903593e23061a913f992.tar.gz chromium_src-f311bd71f1defeb33ec4903593e23061a913f992.tar.bz2 | |
revert 5730
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_ftp_job.cc')
| -rw-r--r-- | net/url_request/url_request_ftp_job.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index 7b72118..9cd7ca9 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -9,7 +9,6 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "base/time.h" #include "net/base/auth.h" #include "net/base/load_flags.h" #include "net/base/net_util.h" @@ -379,8 +378,8 @@ void URLRequestFtpJob::OnFindFile(DWORD last_error) { // We don't know the encoding, and can't assume utf8, so pass the 8bit // directly to the browser for it to decide. string file_entry = net::GetDirectoryListingEntry( - find_data_.cFileName, false, size, - base::Time::FromFileTime(find_data_.ftLastWriteTime)); + find_data_.cFileName, find_data_.dwFileAttributes, size, + &find_data_.ftLastWriteTime); WriteData(&file_entry, true); FindNextFile(); @@ -402,7 +401,7 @@ void URLRequestFtpJob::OnStartDirectoryTraversal() { // If this isn't top level directory (i.e. the path isn't "/",) add a link to // the parent directory. if (request_->url().path().length() > 1) - html.append(net::GetDirectoryListingEntry("..", false, 0, base::Time())); + html.append(net::GetDirectoryListingEntry("..", 0, 0, NULL)); WriteData(&html, true); |