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

Unified Diff: chrome/browser/google_apis/gdata_wapi_operations.cc

Issue 12235002: Add GetUploadStatus method to the DriveServiceInterface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 10 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/google_apis/gdata_wapi_operations.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_operations.cc b/chrome/browser/google_apis/gdata_wapi_operations.cc
index 8ba5b21b381bf5b23501bd8d44d482a7df2438de..f241a9adcb9ccba46cdcde7e6cb885a0286ab7ec 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations.cc
@@ -44,21 +44,21 @@ namespace google_apis {
//============================ Structs ===========================
-ResumeUploadResponse::ResumeUploadResponse()
+UploadRangeResponse::UploadRangeResponse()
: code(HTTP_SUCCESS),
start_position_received(0),
end_position_received(0) {
}
-ResumeUploadResponse::ResumeUploadResponse(GDataErrorCode code,
- int64 start_position_received,
- int64 end_position_received)
+UploadRangeResponse::UploadRangeResponse(GDataErrorCode code,
+ int64 start_position_received,
+ int64 end_position_received)
: code(code),
start_position_received(start_position_received),
end_position_received(end_position_received) {
}
-ResumeUploadResponse::~ResumeUploadResponse() {
+UploadRangeResponse::~UploadRangeResponse() {
}
InitiateUploadParams::InitiateUploadParams(
@@ -605,7 +605,7 @@ bool InitiateUploadOperation::GetContentData(std::string* upload_content_type,
ResumeUploadOperation::ResumeUploadOperation(
OperationRegistry* registry,
net::URLRequestContextGetter* url_request_context_getter,
- const ResumeUploadCallback& callback,
+ const UploadRangeCallback& callback,
const ResumeUploadParams& params)
: UrlFetchOperationBase(registry,
url_request_context_getter,
@@ -655,9 +655,9 @@ void ResumeUploadOperation::ProcessURLFetchResults(const URLFetcher* source) {
<< "], range_parsed=" << start_position_received
<< "," << end_position_received;
- callback_.Run(ResumeUploadResponse(code,
- start_position_received,
- end_position_received),
+ callback_.Run(UploadRangeResponse(code,
+ start_position_received,
+ end_position_received),
scoped_ptr<ResourceEntry>());
OnProcessURLFetchResultsComplete(true);
@@ -694,7 +694,7 @@ void ResumeUploadOperation::OnDataParsed(GDataErrorCode code,
if (!entry.get())
LOG(WARNING) << "Invalid entry received on upload.";
- callback_.Run(ResumeUploadResponse(code, -1, -1), entry.Pass());
+ callback_.Run(UploadRangeResponse(code, -1, -1), entry.Pass());
OnProcessURLFetchResultsComplete(last_chunk_completed_);
}
@@ -710,8 +710,7 @@ void ResumeUploadOperation::NotifySuccessToOperationRegistry() {
}
void ResumeUploadOperation::RunCallbackOnPrematureFailure(GDataErrorCode code) {
- scoped_ptr<ResourceEntry> entry;
- callback_.Run(ResumeUploadResponse(code, 0, 0), entry.Pass());
+ callback_.Run(UploadRangeResponse(code, 0, 0), scoped_ptr<ResourceEntry>());
}
URLFetcher::RequestType ResumeUploadOperation::GetRequestType() const {
« no previous file with comments | « chrome/browser/google_apis/gdata_wapi_operations.h ('k') | chrome/browser/google_apis/gdata_wapi_operations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698