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

Side by Side Diff: google_apis/drive/drive_api_requests.h

Issue 944413003: Add support for setting properties to requests uploading contents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleaned up. Created 5 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 unified diff | Download patch
« no previous file with comments | « google_apis/drive/base_requests_unittest.cc ('k') | google_apis/drive/drive_api_requests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ 5 #ifndef GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
6 #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ 6 #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 void set_modified_date(const base::Time& modified_date) { 262 void set_modified_date(const base::Time& modified_date) {
263 modified_date_ = modified_date; 263 modified_date_ = modified_date;
264 } 264 }
265 265
266 const std::vector<std::string>& parents() const { return parents_; } 266 const std::vector<std::string>& parents() const { return parents_; }
267 void add_parent(const std::string& parent) { parents_.push_back(parent); } 267 void add_parent(const std::string& parent) { parents_.push_back(parent); }
268 268
269 const std::string& title() const { return title_; } 269 const std::string& title() const { return title_; }
270 void set_title(const std::string& title) { title_ = title; } 270 void set_title(const std::string& title) { title_ = title; }
271 271
272 const Properties& properties() const { return properties_; }
273 void set_properties(const Properties& properties) {
274 properties_ = properties;
275 }
276
272 protected: 277 protected:
273 // Overridden from GetDataRequest. 278 // Overridden from GetDataRequest.
274 net::URLFetcher::RequestType GetRequestType() const override; 279 net::URLFetcher::RequestType GetRequestType() const override;
275 bool GetContentData(std::string* upload_content_type, 280 bool GetContentData(std::string* upload_content_type,
276 std::string* upload_content) override; 281 std::string* upload_content) override;
277 282
278 // Overridden from DriveApiDataRequest. 283 // Overridden from DriveApiDataRequest.
279 GURL GetURLInternal() const override; 284 GURL GetURLInternal() const override;
280 285
281 private: 286 private:
282 const DriveApiUrlGenerator url_generator_; 287 const DriveApiUrlGenerator url_generator_;
283 288
284 base::Time last_viewed_by_me_date_; 289 base::Time last_viewed_by_me_date_;
285 std::string mime_type_; 290 std::string mime_type_;
286 base::Time modified_date_; 291 base::Time modified_date_;
287 std::vector<std::string> parents_; 292 std::vector<std::string> parents_;
288 std::string title_; 293 std::string title_;
294 Properties properties_;
289 295
290 DISALLOW_COPY_AND_ASSIGN(FilesInsertRequest); 296 DISALLOW_COPY_AND_ASSIGN(FilesInsertRequest);
291 }; 297 };
292 298
293 //============================== FilesPatchRequest ============================ 299 //============================== FilesPatchRequest ============================
294 300
295 // This class performs the request for patching file metadata. 301 // This class performs the request for patching file metadata.
296 // This request is mapped to 302 // This request is mapped to
297 // https://developers.google.com/drive/v2/reference/files/patch 303 // https://developers.google.com/drive/v2/reference/files/patch
298 class FilesPatchRequest : public DriveApiDataRequest<FileResource> { 304 class FilesPatchRequest : public DriveApiDataRequest<FileResource> {
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 const base::Time& modified_date() const { return modified_date_; } 794 const base::Time& modified_date() const { return modified_date_; }
789 void set_modified_date(const base::Time& modified_date) { 795 void set_modified_date(const base::Time& modified_date) {
790 modified_date_ = modified_date; 796 modified_date_ = modified_date;
791 } 797 }
792 const base::Time& last_viewed_by_me_date() const { 798 const base::Time& last_viewed_by_me_date() const {
793 return last_viewed_by_me_date_; 799 return last_viewed_by_me_date_;
794 } 800 }
795 void set_last_viewed_by_me_date(const base::Time& last_viewed_by_me_date) { 801 void set_last_viewed_by_me_date(const base::Time& last_viewed_by_me_date) {
796 last_viewed_by_me_date_ = last_viewed_by_me_date; 802 last_viewed_by_me_date_ = last_viewed_by_me_date;
797 } 803 }
804 const Properties& properties() const { return properties_; }
805 void set_properties(const Properties& properties) {
806 properties_ = properties;
807 }
798 808
799 protected: 809 protected:
800 // UrlFetchRequestBase overrides. 810 // UrlFetchRequestBase overrides.
801 GURL GetURL() const override; 811 GURL GetURL() const override;
802 net::URLFetcher::RequestType GetRequestType() const override; 812 net::URLFetcher::RequestType GetRequestType() const override;
803 bool GetContentData(std::string* upload_content_type, 813 bool GetContentData(std::string* upload_content_type,
804 std::string* upload_content) override; 814 std::string* upload_content) override;
805 815
806 private: 816 private:
807 const DriveApiUrlGenerator url_generator_; 817 const DriveApiUrlGenerator url_generator_;
808 const std::string parent_resource_id_; 818 const std::string parent_resource_id_;
809 const std::string title_; 819 const std::string title_;
810 820
811 base::Time modified_date_; 821 base::Time modified_date_;
812 base::Time last_viewed_by_me_date_; 822 base::Time last_viewed_by_me_date_;
823 Properties properties_;
813 824
814 DISALLOW_COPY_AND_ASSIGN(InitiateUploadNewFileRequest); 825 DISALLOW_COPY_AND_ASSIGN(InitiateUploadNewFileRequest);
815 }; 826 };
816 827
817 //==================== InitiateUploadExistingFileRequest ===================== 828 //==================== InitiateUploadExistingFileRequest =====================
818 829
819 // This class performs the request for initiating the upload of an existing 830 // This class performs the request for initiating the upload of an existing
820 // file. 831 // file.
821 class InitiateUploadExistingFileRequest : public InitiateUploadRequestBase { 832 class InitiateUploadExistingFileRequest : public InitiateUploadRequestBase {
822 public: 833 public:
(...skipping 21 matching lines...) Expand all
844 const base::Time& modified_date() const { return modified_date_; } 855 const base::Time& modified_date() const { return modified_date_; }
845 void set_modified_date(const base::Time& modified_date) { 856 void set_modified_date(const base::Time& modified_date) {
846 modified_date_ = modified_date; 857 modified_date_ = modified_date;
847 } 858 }
848 const base::Time& last_viewed_by_me_date() const { 859 const base::Time& last_viewed_by_me_date() const {
849 return last_viewed_by_me_date_; 860 return last_viewed_by_me_date_;
850 } 861 }
851 void set_last_viewed_by_me_date(const base::Time& last_viewed_by_me_date) { 862 void set_last_viewed_by_me_date(const base::Time& last_viewed_by_me_date) {
852 last_viewed_by_me_date_ = last_viewed_by_me_date; 863 last_viewed_by_me_date_ = last_viewed_by_me_date;
853 } 864 }
865 const Properties& properties() const { return properties_; }
866 void set_properties(const Properties& properties) {
867 properties_ = properties;
868 }
854 869
855 protected: 870 protected:
856 // UrlFetchRequestBase overrides. 871 // UrlFetchRequestBase overrides.
857 GURL GetURL() const override; 872 GURL GetURL() const override;
858 net::URLFetcher::RequestType GetRequestType() const override; 873 net::URLFetcher::RequestType GetRequestType() const override;
859 std::vector<std::string> GetExtraRequestHeaders() const override; 874 std::vector<std::string> GetExtraRequestHeaders() const override;
860 bool GetContentData(std::string* upload_content_type, 875 bool GetContentData(std::string* upload_content_type,
861 std::string* upload_content) override; 876 std::string* upload_content) override;
862 877
863 private: 878 private:
864 const DriveApiUrlGenerator url_generator_; 879 const DriveApiUrlGenerator url_generator_;
865 const std::string resource_id_; 880 const std::string resource_id_;
866 const std::string etag_; 881 const std::string etag_;
867 882
868 std::string parent_resource_id_; 883 std::string parent_resource_id_;
869 std::string title_; 884 std::string title_;
870 base::Time modified_date_; 885 base::Time modified_date_;
871 base::Time last_viewed_by_me_date_; 886 base::Time last_viewed_by_me_date_;
887 Properties properties_;
872 888
873 DISALLOW_COPY_AND_ASSIGN(InitiateUploadExistingFileRequest); 889 DISALLOW_COPY_AND_ASSIGN(InitiateUploadExistingFileRequest);
874 }; 890 };
875 891
876 // Callback used for ResumeUpload() and GetUploadStatus(). 892 // Callback used for ResumeUpload() and GetUploadStatus().
877 typedef base::Callback<void( 893 typedef base::Callback<void(
878 const UploadRangeResponse& response, 894 const UploadRangeResponse& response,
879 scoped_ptr<FileResource> new_resource)> UploadRangeCallback; 895 scoped_ptr<FileResource> new_resource)> UploadRangeCallback;
880 896
881 //============================ ResumeUploadRequest =========================== 897 //============================ ResumeUploadRequest ===========================
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 // See also the comments of MultipartUploadRequestBase for more details 962 // See also the comments of MultipartUploadRequestBase for more details
947 // about the other parameters. 963 // about the other parameters.
948 MultipartUploadNewFileRequest(RequestSender* sender, 964 MultipartUploadNewFileRequest(RequestSender* sender,
949 const std::string& title, 965 const std::string& title,
950 const std::string& parent_resource_id, 966 const std::string& parent_resource_id,
951 const std::string& content_type, 967 const std::string& content_type,
952 int64 content_length, 968 int64 content_length,
953 const base::Time& modified_date, 969 const base::Time& modified_date,
954 const base::Time& last_viewed_by_me_date, 970 const base::Time& last_viewed_by_me_date,
955 const base::FilePath& local_file_path, 971 const base::FilePath& local_file_path,
972 const Properties& properties,
956 const DriveApiUrlGenerator& url_generator, 973 const DriveApiUrlGenerator& url_generator,
957 const FileResourceCallback& callback, 974 const FileResourceCallback& callback,
958 const ProgressCallback& progress_callback); 975 const ProgressCallback& progress_callback);
959 ~MultipartUploadNewFileRequest() override; 976 ~MultipartUploadNewFileRequest() override;
960 977
961 protected: 978 protected:
962 // UrlFetchRequestBase overrides. 979 // UrlFetchRequestBase overrides.
963 GURL GetURL() const override; 980 GURL GetURL() const override;
964 net::URLFetcher::RequestType GetRequestType() const override; 981 net::URLFetcher::RequestType GetRequestType() const override;
965 982
966 private: 983 private:
984 const bool has_modified_date_;
967 const DriveApiUrlGenerator url_generator_; 985 const DriveApiUrlGenerator url_generator_;
968 986
969 DISALLOW_COPY_AND_ASSIGN(MultipartUploadNewFileRequest); 987 DISALLOW_COPY_AND_ASSIGN(MultipartUploadNewFileRequest);
970 }; 988 };
971 989
972 //======================= MultipartUploadExistingFileRequest =================== 990 //======================= MultipartUploadExistingFileRequest ===================
973 991
974 // This class performs the request for initiating the upload of a new file. 992 // This class performs the request for initiating the upload of a new file.
975 class MultipartUploadExistingFileRequest : public MultipartUploadRequestBase { 993 class MultipartUploadExistingFileRequest : public MultipartUploadRequestBase {
976 public: 994 public:
977 // |parent_resource_id| should be the resource id of the parent directory. 995 // |parent_resource_id| should be the resource id of the parent directory.
978 // |title| should be set. 996 // |title| should be set.
979 // See also the comments of MultipartUploadRequestBase for more details 997 // See also the comments of MultipartUploadRequestBase for more details
980 // about the other parameters. 998 // about the other parameters.
981 MultipartUploadExistingFileRequest(RequestSender* sender, 999 MultipartUploadExistingFileRequest(RequestSender* sender,
982 const std::string& title, 1000 const std::string& title,
983 const std::string& resource_id, 1001 const std::string& resource_id,
984 const std::string& parent_resource_id, 1002 const std::string& parent_resource_id,
985 const std::string& content_type, 1003 const std::string& content_type,
986 int64 content_length, 1004 int64 content_length,
987 const base::Time& modified_date, 1005 const base::Time& modified_date,
988 const base::Time& last_viewed_by_me_date, 1006 const base::Time& last_viewed_by_me_date,
989 const base::FilePath& local_file_path, 1007 const base::FilePath& local_file_path,
990 const std::string& etag, 1008 const std::string& etag,
1009 const Properties& properties,
991 const DriveApiUrlGenerator& url_generator, 1010 const DriveApiUrlGenerator& url_generator,
992 const FileResourceCallback& callback, 1011 const FileResourceCallback& callback,
993 const ProgressCallback& progress_callback); 1012 const ProgressCallback& progress_callback);
994 ~MultipartUploadExistingFileRequest() override; 1013 ~MultipartUploadExistingFileRequest() override;
995 1014
996 protected: 1015 protected:
997 // UrlFetchRequestBase overrides. 1016 // UrlFetchRequestBase overrides.
998 std::vector<std::string> GetExtraRequestHeaders() const override; 1017 std::vector<std::string> GetExtraRequestHeaders() const override;
999 GURL GetURL() const override; 1018 GURL GetURL() const override;
1000 net::URLFetcher::RequestType GetRequestType() const override; 1019 net::URLFetcher::RequestType GetRequestType() const override;
1001 1020
1002 private: 1021 private:
1003 const std::string resource_id_; 1022 const std::string resource_id_;
1004 const std::string etag_; 1023 const std::string etag_;
1024 const bool has_modified_date_;
1005 const DriveApiUrlGenerator url_generator_; 1025 const DriveApiUrlGenerator url_generator_;
1006 1026
1007 DISALLOW_COPY_AND_ASSIGN(MultipartUploadExistingFileRequest); 1027 DISALLOW_COPY_AND_ASSIGN(MultipartUploadExistingFileRequest);
1008 }; 1028 };
1009 1029
1010 //========================== DownloadFileRequest ========================== 1030 //========================== DownloadFileRequest ==========================
1011 1031
1012 // This class performs the request for downloading of a specified file. 1032 // This class performs the request for downloading of a specified file.
1013 class DownloadFileRequest : public DownloadFileRequestBase { 1033 class DownloadFileRequest : public DownloadFileRequestBase {
1014 public: 1034 public:
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 PermissionRole role_; 1090 PermissionRole role_;
1071 std::string value_; 1091 std::string value_;
1072 1092
1073 DISALLOW_COPY_AND_ASSIGN(PermissionsInsertRequest); 1093 DISALLOW_COPY_AND_ASSIGN(PermissionsInsertRequest);
1074 }; 1094 };
1075 1095
1076 } // namespace drive 1096 } // namespace drive
1077 } // namespace google_apis 1097 } // namespace google_apis
1078 1098
1079 #endif // GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ 1099 #endif // GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_
OLDNEW
« no previous file with comments | « google_apis/drive/base_requests_unittest.cc ('k') | google_apis/drive/drive_api_requests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698