| Index: storage/browser/fileapi/file_system_url_request_job.h
|
| diff --git a/webkit/browser/fileapi/file_system_url_request_job.h b/storage/browser/fileapi/file_system_url_request_job.h
|
| similarity index 80%
|
| rename from webkit/browser/fileapi/file_system_url_request_job.h
|
| rename to storage/browser/fileapi/file_system_url_request_job.h
|
| index 29b42a5f0605aaf8275af583830a3be10d01c107..ecdcbb65f4eb6b6ec4c9fb58b52819ece30ecfd6 100644
|
| --- a/webkit/browser/fileapi/file_system_url_request_job.h
|
| +++ b/storage/browser/fileapi/file_system_url_request_job.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "net/http/http_byte_range.h"
|
| #include "net/url_request/url_request_job.h"
|
| -#include "webkit/browser/fileapi/file_system_url.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/browser/fileapi/file_system_url.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| class GURL;
|
|
|
| @@ -22,22 +22,21 @@ namespace base {
|
| class FilePath;
|
| }
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
| class FileStreamReader;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| class FileSystemContext;
|
|
|
| // A request job that handles reading filesystem: URLs
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
|
| +class STORAGE_EXPORT_PRIVATE FileSystemURLRequestJob
|
| : public net::URLRequestJob {
|
| public:
|
| - FileSystemURLRequestJob(
|
| - net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate,
|
| - const std::string& storage_domain,
|
| - FileSystemContext* file_system_context);
|
| + FileSystemURLRequestJob(net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate,
|
| + const std::string& storage_domain,
|
| + FileSystemContext* file_system_context);
|
|
|
| // URLRequestJob methods:
|
| virtual void Start() OVERRIDE;
|
| @@ -69,7 +68,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
|
|
|
| const std::string storage_domain_;
|
| FileSystemContext* file_system_context_;
|
| - scoped_ptr<webkit_blob::FileStreamReader> reader_;
|
| + scoped_ptr<storage::FileStreamReader> reader_;
|
| FileSystemURL url_;
|
| bool is_directory_;
|
| scoped_ptr<net::HttpResponseInfo> response_info_;
|
| @@ -80,6 +79,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemURLRequestJob
|
| DISALLOW_COPY_AND_ASSIGN(FileSystemURLRequestJob);
|
| };
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
|
|
|