Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1978)

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc

Issue 513683002: [fsp] Add support for providing thumbnails. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use scoped_ptr for EntryMetadata. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
index fa3b4985dbdc00e6928157b6bfbd69f947d30908..29986286e890b9969eb6d7fe9d625d39b8ce0f1e 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
@@ -114,12 +114,15 @@ class FileStreamReader::OperationRunner
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
- base::Bind(callback, EntryMetadata(), base::File::FILE_ERROR_ABORT));
+ base::Bind(callback,
+ base::Passed(make_scoped_ptr<EntryMetadata>(NULL)),
+ base::File::FILE_ERROR_ABORT));
return;
}
abort_callback_ = file_system_->GetMetadata(
file_path_,
+ ProvidedFileSystemInterface::METADATA_FIELD_DEFAULT,
base::Bind(&OperationRunner::OnGetMetadataCompletedOnUIThread,
this,
callback));
@@ -166,11 +169,13 @@ class FileStreamReader::OperationRunner
// Forwards a metadata to the IO thread.
void OnGetMetadataCompletedOnUIThread(
const ProvidedFileSystemInterface::GetMetadataCallback& callback,
- const EntryMetadata& metadata,
+ scoped_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE, base::Bind(callback, metadata, result));
+ BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(callback, base::Passed(&metadata), result));
}
// Forwards a response of reading from a file to the IO thread.
@@ -282,7 +287,7 @@ void FileStreamReader::OnOpenFileCompleted(
void FileStreamReader::OnInitializeCompleted(
const base::Closure& pending_closure,
const net::Int64CompletionCallback& error_callback,
- const EntryMetadata& metadata,
+ scoped_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(INITIALIZING, state_);
@@ -296,8 +301,9 @@ void FileStreamReader::OnInitializeCompleted(
// If the file modification time has changed, then abort. Note, that the file
// may be changed without affecting the modification time.
+ DCHECK(metadata.get());
if (!expected_modification_time_.is_null() &&
- metadata.modification_time != expected_modification_time_) {
+ metadata->modification_time != expected_modification_time_) {
state_ = FAILED;
error_callback.Run(net::ERR_UPLOAD_FILE_CHANGED);
return;
@@ -461,7 +467,7 @@ void FileStreamReader::OnReadChunkReceived(
void FileStreamReader::OnGetMetadataForGetLengthReceived(
const net::Int64CompletionCallback& callback,
- const EntryMetadata& metadata,
+ scoped_ptr<EntryMetadata> metadata,
base::File::Error result) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK_EQ(INITIALIZED, state_);
@@ -475,14 +481,15 @@ void FileStreamReader::OnGetMetadataForGetLengthReceived(
// If the file modification time has changed, then abort. Note, that the file
// may be changed without affecting the modification time.
+ DCHECK(metadata.get());
if (!expected_modification_time_.is_null() &&
- metadata.modification_time != expected_modification_time_) {
+ metadata->modification_time != expected_modification_time_) {
callback.Run(net::ERR_UPLOAD_FILE_CHANGED);
return;
}
DCHECK_EQ(base::File::FILE_OK, result);
- callback.Run(metadata.size);
+ callback.Run(metadata->size);
}
} // namespace file_system_provider

Powered by Google App Engine
This is Rietveld 408576698