Notify upload progress from batch request to its child requests.

google_apis/drive/drive_api_requests.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
 #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 1096 matching lines @@
   std::string value_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsInsertRequest);
 };
 
 //========================== BatchUploadRequest ==========================
 
 struct BatchUploadChildEntry {
   BatchUploadChildEntry() : request(NULL), prepared(false) {}
   explicit BatchUploadChildEntry(BatchableRequestBase* request)
-      : request(request), prepared(false) {}
+      : request(request), prepared(false), data_position(0), data_size(0) {}
   BatchableRequestBase* request;
   bool prepared;
+  int64 data_position;

[kinaba, 2015/05/11 13:17:35]

maybe: data_offset (ditto for other use of "position"s.)

[hirono, 2015/05/12 03:42:17]

Done.

+  int64 data_size;
 };
 
 class BatchUploadRequest : public UrlFetchRequestBase {
  public:
   BatchUploadRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator);
   ~BatchUploadRequest() override;
 
   // Adds request to the batch request.
   void AddRequest(BatchableRequestBase* request);
@@ skipping 18 matching lines @@
   void Prepare(const PrepareCallback& callback) override;
   void Cancel() override;
   GURL GetURL() const override;
   net::URLFetcher::RequestType GetRequestType() const override;
   std::vector<std::string> GetExtraRequestHeaders() const override;
   bool GetContentData(std::string* upload_content_type,
                       std::string* upload_content) override;
   void ProcessURLFetchResults(const net::URLFetcher* source) override;
   void RunCallbackOnPrematureFailure(DriveApiErrorCode code) override;
 
+  // content::UrlFetcherDelegate overrides.
+  void OnURLFetchUploadProgress(const net::URLFetcher* source,
+                                int64 current,
+                                int64 total) override;
+
  private:
   typedef void* RequestID;
   // Obtains corresponding child entry of |request_id|. Returns NULL if the
   // entry is not found.
   std::vector<BatchUploadChildEntry>::iterator GetChildEntry(
       RequestID request_id);
 
   // Called after child requests' |Prepare| method.
   void OnChildRequestPrepared(RequestID request_id, DriveApiErrorCode result);
 
   // Complete |Prepare| if possible.
   void MayCompletePrepare();
 
   // Process result for each child.
   void ProcessURLFetchResultsForChild(RequestID id, const std::string& body);
 
   RequestSender* const sender_;
   const DriveApiUrlGenerator url_generator_;
   std::vector<BatchUploadChildEntry> child_requests_;
 
   PrepareCallback prepare_callback_;
   bool committed_;
 
   // Boundary of multipart body.
   std::string boundary_;
 
   // Multipart of child requests.
   ContentTypeAndData upload_content_;
 
+  // Last reported progress value.
+  int64 last_progress_value_;
+
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BatchUploadRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BatchUploadRequest);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_