| Index: storage/browser/blob/local_file_stream_reader.h
|
| diff --git a/webkit/browser/blob/local_file_stream_reader.h b/storage/browser/blob/local_file_stream_reader.h
|
| similarity index 88%
|
| rename from webkit/browser/blob/local_file_stream_reader.h
|
| rename to storage/browser/blob/local_file_stream_reader.h
|
| index c96cb5a78621892deda64a95321fae05e3c5539d..cec69b1405755626b25aafe840ed10cd838d785b 100644
|
| --- a/webkit/browser/blob/local_file_stream_reader.h
|
| +++ b/storage/browser/blob/local_file_stream_reader.h
|
| @@ -11,8 +11,8 @@
|
| #include "base/files/file_path.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| -#include "webkit/browser/blob/file_stream_reader.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/browser/blob/file_stream_reader.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| namespace base {
|
| class TaskRunner;
|
| @@ -26,17 +26,18 @@ namespace net {
|
| class FileStream;
|
| }
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| // A thin wrapper of net::FileStream with range support for sliced file
|
| // handling.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamReader
|
| +class STORAGE_EXPORT LocalFileStreamReader
|
| : public NON_EXPORTED_BASE(FileStreamReader) {
|
| public:
|
| virtual ~LocalFileStreamReader();
|
|
|
| // FileStreamReader overrides.
|
| - virtual int Read(net::IOBuffer* buf, int buf_len,
|
| + virtual int Read(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int64 GetLength(
|
| const net::Int64CompletionCallback& callback) OVERRIDE;
|
| @@ -54,8 +55,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamReader
|
| // Callbacks that are chained from Open for Read.
|
| void DidVerifyForOpen(const net::CompletionCallback& callback,
|
| int64 get_length_result);
|
| - void DidOpenFileStream(const net::CompletionCallback& callback,
|
| - int result);
|
| + void DidOpenFileStream(const net::CompletionCallback& callback, int result);
|
| void DidSeekFileStream(const net::CompletionCallback& callback,
|
| int64 seek_result);
|
| void DidOpenForRead(net::IOBuffer* buf,
|
| @@ -76,6 +76,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamReader
|
| base::WeakPtrFactory<LocalFileStreamReader> weak_factory_;
|
| };
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_BLOB_LOCAL_FILE_STREAM_READER_H_
|
|
|