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

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

Issue 12246002: Implement GetUploadStatusOperation on GData WAPI. (Closed) Base URL: http://git.chromium.org/chromium/src.git@b148632_create_base_operation
Patch Set: Remove unknown content length support, which is not used. 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 b180c5aae73c8043c93b638a43d2390c62d28a52..481c45f8ef9d1539241055c7b1a81a069f2d6606 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations.cc
@@ -758,19 +758,17 @@ std::vector<std::string> ResumeUploadOperation::GetExtraRequestHeaders() const {
// Content-Range: bytes <start_position>-<end_position>/<content_length>
// for example:
// Content-Range: bytes 7864320-8388607/13851821
- // Use * for unknown/streaming content length.
// The header takes inclusive range, so we adjust by "end_position - 1".
DCHECK_GE(start_position_, 0);
DCHECK_GT(end_position_, 0);
- DCHECK_GE(content_length_, -1);
+ DCHECK_GE(content_length_, 0);
std::vector<std::string> headers;
headers.push_back(
std::string(kUploadContentRange) +
base::Int64ToString(start_position_) + "-" +
base::Int64ToString(end_position_ - 1) + "/" +
- (content_length_ == -1 ? "*" :
- base::Int64ToString(content_length_)));
+ base::Int64ToString(content_length_));
return headers;
}
@@ -787,4 +785,39 @@ void ResumeUploadOperation::OnURLFetchUploadProgress(
NotifyProgress(start_position_ + current, content_length_);
}
+//========================== GetUploadStatusOperation ==========================
+
+GetUploadStatusOperation::GetUploadStatusOperation(
+ OperationRegistry* registry,
+ net::URLRequestContextGetter* url_request_context_getter,
+ const UploadRangeCallback& callback,
+ UploadMode upload_mode,
+ const FilePath& drive_file_path,
+ const GURL& upload_url,
+ int64 content_length)
+ : UploadRangeOperationBase(registry,
+ url_request_context_getter,
+ callback,
+ upload_mode,
+ drive_file_path,
+ upload_url),
+ content_length_(content_length) {}
+
+GetUploadStatusOperation::~GetUploadStatusOperation() {}
+
+std::vector<std::string>
+GetUploadStatusOperation::GetExtraRequestHeaders() const {
+ // The header looks like
+ // Content-Range: bytes */<content_length>
+ // for example:
+ // Content-Range: bytes */13851821
+ DCHECK_GE(content_length_, 0);
+
+ std::vector<std::string> headers;
+ headers.push_back(
+ std::string(kUploadContentRange) + "*/" +
+ base::Int64ToString(content_length_));
+ return headers;
+}
+
} // namespace google_apis

Powered by Google App Engine
This is Rietveld 408576698