summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_ftp_job.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 23:04:29 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 23:04:29 +0000
commit721c3f17a7fb36edaa17f607a11db9c82ba720ca (patch)
treec78e993a5474acdb2751c222db8787d7aa482301 /net/url_request/url_request_ftp_job.cc
parentf785ad125747f9125c952c7e74f2154098ee15a9 (diff)
downloadchromium_src-721c3f17a7fb36edaa17f607a11db9c82ba720ca.zip
chromium_src-721c3f17a7fb36edaa17f607a11db9c82ba720ca.tar.gz
chromium_src-721c3f17a7fb36edaa17f607a11db9c82ba720ca.tar.bz2
Port directory lister so test shell can view file directories.
Review URL: http://codereview.chromium.org/11437 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5725 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.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index 9cd7ca9..7b72118 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -9,6 +9,7 @@
#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"
@@ -378,8 +379,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, find_data_.dwFileAttributes, size,
- &find_data_.ftLastWriteTime);
+ find_data_.cFileName, false, size,
+ base::Time::FromFileTime(find_data_.ftLastWriteTime));
WriteData(&file_entry, true);
FindNextFile();
@@ -401,7 +402,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("..", 0, 0, NULL));
+ html.append(net::GetDirectoryListingEntry("..", false, 0, base::Time()));
WriteData(&html, true);