google_apis: Remove document_url_ from EntryActionOperation

chrome/browser/google_apis/gdata_wapi_operations.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 CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_OPERATIONS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_OPERATIONS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 139 matching lines @@
 
  protected:
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
 
   // Overridden from EntryActionOperation.
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
+  GURL document_url_;
+
   DISALLOW_COPY_AND_ASSIGN(DeleteDocumentOperation);
 };
 
 //========================== CreateDirectoryOperation ==========================
 
 // This class performs the operation for creating a directory.
 class CreateDirectoryOperation : public GetDataOperation {
  public:
   // Empty |parent_content_url| will create the directory in the root folder.
   CreateDirectoryOperation(OperationRegistry* registry,
@@ skipping 26 matching lines @@
 class CopyDocumentOperation : public GetDataOperation {
  public:
   CopyDocumentOperation(OperationRegistry* registry,
                         const GDataWapiUrlGenerator& url_generator,
                         const GetDataCallback& callback,
                         const std::string& resource_id,
                         const FilePath::StringType& new_name);
   virtual ~CopyDocumentOperation();
 
  protected:
-  // Overridden from GetDataOperation.
+  // Overridden from UrlFetchOperationBase.
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
 
  private:
   GDataWapiUrlGenerator url_generator_;
   std::string resource_id_;
@@ skipping 17 matching lines @@
   // Overridden from EntryActionOperation.
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
 
  private:
+  GURL document_url_;
   FilePath::StringType new_name_;
 
   DISALLOW_COPY_AND_ASSIGN(RenameResourceOperation);
 };
 
 //=========================== AuthorizeAppOperation ==========================
 
 // This class performs the operation for authorizing an application specified
 // by |app_id| to access a document specified by |document_url| for .
 class AuthorizeAppOperation : public GetDataOperation {
  public:
   AuthorizeAppOperation(OperationRegistry* registry,
                         const GetDataCallback& callback,
                         const GURL& document_url,
                         const std::string& app_id);
   virtual ~AuthorizeAppOperation();
 
  protected:
-  // Overridden from EntryActionOperation.
+  // Overridden from GetDataOperation.
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
 
   // Overridden from UrlFetchOperationBase.
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
   // Overridden from GetDataOperation.
   virtual GURL GetURL() const OVERRIDE;
   virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
@@ skipping 26 matching lines @@
  protected:
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
 
  private:
   GDataWapiUrlGenerator url_generator_;
   GURL parent_content_url_;
+  GURL document_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AddResourceToDirectoryOperation);
 };
 
 //==================== RemoveResourceFromDirectoryOperation ====================
 
 // This class performs the operation for adding a document/file/directory
 // from a directory.
+//
+// TODO(satorux): Remove |document_url| parameter. crbug.com/163308
 class RemoveResourceFromDirectoryOperation : public EntryActionOperation {
  public:
   RemoveResourceFromDirectoryOperation(OperationRegistry* registry,
                                        const EntryActionCallback& callback,
                                        const GURL& parent_content_url,
                                        const GURL& document_url,
                                        const std::string& resource_id);
   virtual ~RemoveResourceFromDirectoryOperation();
 
  protected:
   // Overridden from UrlFetchOperationBase.
   virtual GURL GetURL() const OVERRIDE;
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
 
  private:
   std::string resource_id_;
   GURL parent_content_url_;
+  GURL document_url_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveResourceFromDirectoryOperation);
 };
 
 //=========================== InitiateUploadOperation ==========================
 
 // Struct for passing params needed for DriveServiceInterface::InitiateUpload()
 // calls.
 //
 // When uploading a new file (UPLOAD_NEW_FILE):
@@ skipping 128 matching lines @@
   ResumeUploadCallback callback_;
   ResumeUploadParams params_;
   bool last_chunk_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(ResumeUploadOperation);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_OPERATIONS_H_