Index: net/url_request/url_request_file_dir_job.h |
diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h |
index bdb9b375481ab0825f73c48a450dd506d5cc5ead..2b40a98f668a6bab3dc6856fa60b98f495cf2e5e 100644 |
--- a/net/url_request/url_request_file_dir_job.h |
+++ b/net/url_request/url_request_file_dir_job.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__ |
-#define NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__ |
+#ifndef NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_ |
+#define NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_ |
#pragma once |
#include <string> |
@@ -14,23 +14,25 @@ |
#include "net/base/directory_lister.h" |
#include "net/url_request/url_request_job.h" |
+namespace net { |
+ |
class URLRequestFileDirJob |
- : public net::URLRequestJob, |
- public net::DirectoryLister::DirectoryListerDelegate { |
+ : public URLRequestJob, |
+ public DirectoryLister::DirectoryListerDelegate { |
public: |
- URLRequestFileDirJob(net::URLRequest* request, const FilePath& dir_path); |
+ URLRequestFileDirJob(URLRequest* request, const FilePath& dir_path); |
- // net::URLRequestJob methods: |
wtc
2011/01/05 00:17:18
Nit: the "<base class> methods:" comments are the
|
+ // Overridden from URLRequestJob: |
virtual void Start(); |
virtual void StartAsync(); |
virtual void Kill(); |
- virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read); |
+ virtual bool ReadRawData(IOBuffer* buf, int buf_size, int *bytes_read); |
virtual bool GetMimeType(std::string* mime_type) const; |
virtual bool GetCharset(std::string* charset); |
- // DirectoryLister::DirectoryListerDelegate methods: |
+ // Overridden from DirectoryLister::DirectoryListerDelegate: |
virtual void OnListFile( |
- const net::DirectoryLister::DirectoryListerData& data); |
+ const DirectoryLister::DirectoryListerData& data); |
virtual void OnListDone(int error); |
bool list_complete() const { return list_complete_; } |
@@ -47,7 +49,7 @@ class URLRequestFileDirJob |
// Fills a buffer with the output. |
bool FillReadBuffer(char *buf, int buf_size, int *bytes_read); |
- scoped_refptr<net::DirectoryLister> lister_; |
+ scoped_refptr<DirectoryLister> lister_; |
FilePath dir_path_; |
std::string data_; |
bool canceled_; |
@@ -62,11 +64,13 @@ class URLRequestFileDirJob |
// we wait for IO to complete. When done, we fill the buffer |
// manually. |
bool read_pending_; |
- scoped_refptr<net::IOBuffer> read_buffer_; |
+ scoped_refptr<IOBuffer> read_buffer_; |
int read_buffer_length_; |
ScopedRunnableMethodFactory<URLRequestFileDirJob> method_factory_; |
DISALLOW_COPY_AND_ASSIGN(URLRequestFileDirJob); |
}; |
-#endif // NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__ |
+} // namespace net |
+ |
+#endif // NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_ |