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

Unified Diff: webkit/browser/chromeos/fileapi/remote_file_system_operation.cc

Issue 16311010: Make FileSystemOperation::Write take closure-friendly parameters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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: webkit/browser/chromeos/fileapi/remote_file_system_operation.cc
diff --git a/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc b/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc
index e69879b2a4b6cdcbff24cc8dbf342cdc9f07798d..5a5e6eb74db28b6508218c539f9331aa0e998964 100644
--- a/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc
+++ b/webkit/browser/chromeos/fileapi/remote_file_system_operation.cc
@@ -9,7 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
-#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request.h"
#include "webkit/browser/chromeos/fileapi/remote_file_stream_writer.h"
#include "webkit/browser/fileapi/file_system_url.h"
#include "webkit/browser/fileapi/file_writer_delegate.h"
@@ -103,25 +103,15 @@ void RemoteFileSystemOperation::Move(const FileSystemURL& src_url,
}
void RemoteFileSystemOperation::Write(
- const net::URLRequestContext* url_request_context,
const FileSystemURL& url,
- const GURL& blob_url,
- int64 offset,
+ scoped_ptr<fileapi::FileWriterDelegate> writer_delegate,
+ scoped_ptr<net::URLRequest> blob_request,
const WriteCallback& callback) {
DCHECK(SetPendingOperationType(kOperationWrite));
- file_writer_delegate_.reset(
- new fileapi::FileWriterDelegate(
- base::Bind(&RemoteFileSystemOperation::DidWrite,
- AsWeakPtr(), callback),
- scoped_ptr<fileapi::FileStreamWriter>(
- new fileapi::RemoteFileStreamWriter(remote_proxy_,
- url,
- offset))));
-
- scoped_ptr<net::URLRequest> blob_request(url_request_context->CreateRequest(
- blob_url, file_writer_delegate_.get()));
-
- file_writer_delegate_->Start(blob_request.Pass());
+ file_writer_delegate_ = writer_delegate.Pass();
+ file_writer_delegate_->Start(
+ blob_request.Pass(),
+ base::Bind(&RemoteFileSystemOperation::DidWrite, AsWeakPtr(), callback));
}
void RemoteFileSystemOperation::Truncate(const FileSystemURL& url,

Powered by Google App Engine
This is Rietveld 408576698