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

Unified Diff: chrome/browser/chromeos/gdata/gdata_uploader.cc

Issue 10837061: gdata: Make WeakPtrFactory the last parameter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and reorder Created 8 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_uploader.h ('k') | chrome/browser/chromeos/gdata/operations_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_uploader.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_uploader.cc b/chrome/browser/chromeos/gdata/gdata_uploader.cc
index 0451eda7cc5f99d89e769221954397af74d246bb..806a86ad73d0d5d51f8378fbf76e30ce1776ac77 100644
--- a/chrome/browser/chromeos/gdata/gdata_uploader.cc
+++ b/chrome/browser/chromeos/gdata/gdata_uploader.cc
@@ -33,7 +33,7 @@ namespace gdata {
GDataUploader::GDataUploader(DocumentsServiceInterface* documents_service)
: documents_service_(documents_service),
next_upload_id_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(uploader_factory_(this)) {
+ ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
}
GDataUploader::~GDataUploader() {
@@ -194,7 +194,7 @@ void GDataUploader::OpenFile(UploadFileInfo* upload_file_info) {
base::PLATFORM_FILE_READ |
base::PLATFORM_FILE_ASYNC,
base::Bind(&GDataUploader::OpenCompletionCallback,
- uploader_factory_.GetWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
upload_file_info->upload_id));
DCHECK_EQ(net::ERR_IO_PENDING, rv);
}
@@ -247,7 +247,7 @@ void GDataUploader::OpenCompletionCallback(int upload_id, int result) {
upload_file_info->initial_upload_location,
upload_file_info->gdata_path),
base::Bind(&GDataUploader::OnUploadLocationReceived,
- uploader_factory_.GetWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
upload_file_info->upload_id));
}
@@ -321,7 +321,7 @@ void GDataUploader::UploadNextChunk(UploadFileInfo* upload_file_info) {
base::MessageLoopProxy::current()->PostTask(
FROM_HERE,
base::Bind(&GDataUploader::ResumeUpload,
- uploader_factory_.GetWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
upload_file_info->upload_id));
return;
}
@@ -330,7 +330,7 @@ void GDataUploader::UploadNextChunk(UploadFileInfo* upload_file_info) {
upload_file_info->buf,
bytes_to_read,
base::Bind(&GDataUploader::ReadCompletionCallback,
- uploader_factory_.GetWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
upload_file_info->upload_id,
bytes_to_read));
}
@@ -375,7 +375,7 @@ void GDataUploader::ResumeUpload(int upload_id) {
upload_file_info->upload_location,
upload_file_info->gdata_path),
base::Bind(&GDataUploader::OnResumeUploadResponseReceived,
- uploader_factory_.GetWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
upload_file_info->upload_id));
}
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_uploader.h ('k') | chrome/browser/chromeos/gdata/operations_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698