| OLD | NEW |
| 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 #include "chrome/browser/google_apis/gdata_wapi_operations.h" | 5 #include "chrome/browser/google_apis/gdata_wapi_operations.h" |
| 6 | 6 |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/task_runner_util.h" | 9 #include "base/task_runner_util.h" |
| 10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 GetResourceListOperation::GetResourceListOperation( | 163 GetResourceListOperation::GetResourceListOperation( |
| 164 OperationRunner* runner, | 164 OperationRunner* runner, |
| 165 net::URLRequestContextGetter* url_request_context_getter, | 165 net::URLRequestContextGetter* url_request_context_getter, |
| 166 const GDataWapiUrlGenerator& url_generator, | 166 const GDataWapiUrlGenerator& url_generator, |
| 167 const GURL& override_url, | 167 const GURL& override_url, |
| 168 int64 start_changestamp, | 168 int64 start_changestamp, |
| 169 const std::string& search_string, | 169 const std::string& search_string, |
| 170 const std::string& directory_resource_id, | 170 const std::string& directory_resource_id, |
| 171 const GetResourceListCallback& callback) | 171 const GetResourceListCallback& callback) |
| 172 : GetDataOperation(runner, url_request_context_getter, | 172 : GetDataRequest(runner, url_request_context_getter, |
| 173 base::Bind(&ParseResourceListAndRun, callback)), | 173 base::Bind(&ParseResourceListAndRun, callback)), |
| 174 url_generator_(url_generator), | 174 url_generator_(url_generator), |
| 175 override_url_(override_url), | 175 override_url_(override_url), |
| 176 start_changestamp_(start_changestamp), | 176 start_changestamp_(start_changestamp), |
| 177 search_string_(search_string), | 177 search_string_(search_string), |
| 178 directory_resource_id_(directory_resource_id) { | 178 directory_resource_id_(directory_resource_id) { |
| 179 DCHECK(!callback.is_null()); | 179 DCHECK(!callback.is_null()); |
| 180 } | 180 } |
| 181 | 181 |
| 182 GetResourceListOperation::~GetResourceListOperation() {} | 182 GetResourceListOperation::~GetResourceListOperation() {} |
| 183 | 183 |
| 184 GURL GetResourceListOperation::GetURL() const { | 184 GURL GetResourceListOperation::GetURL() const { |
| 185 return url_generator_.GenerateResourceListUrl(override_url_, | 185 return url_generator_.GenerateResourceListUrl(override_url_, |
| 186 start_changestamp_, | 186 start_changestamp_, |
| 187 search_string_, | 187 search_string_, |
| 188 directory_resource_id_); | 188 directory_resource_id_); |
| 189 } | 189 } |
| 190 | 190 |
| 191 //============================ SearchByTitleOperation ========================== | 191 //============================ SearchByTitleOperation ========================== |
| 192 | 192 |
| 193 SearchByTitleOperation::SearchByTitleOperation( | 193 SearchByTitleOperation::SearchByTitleOperation( |
| 194 OperationRunner* runner, | 194 OperationRunner* runner, |
| 195 net::URLRequestContextGetter* url_request_context_getter, | 195 net::URLRequestContextGetter* url_request_context_getter, |
| 196 const GDataWapiUrlGenerator& url_generator, | 196 const GDataWapiUrlGenerator& url_generator, |
| 197 const std::string& title, | 197 const std::string& title, |
| 198 const std::string& directory_resource_id, | 198 const std::string& directory_resource_id, |
| 199 const GetResourceListCallback& callback) | 199 const GetResourceListCallback& callback) |
| 200 : GetDataOperation(runner, url_request_context_getter, | 200 : GetDataRequest(runner, url_request_context_getter, |
| 201 base::Bind(&ParseResourceListAndRun, callback)), | 201 base::Bind(&ParseResourceListAndRun, callback)), |
| 202 url_generator_(url_generator), | 202 url_generator_(url_generator), |
| 203 title_(title), | 203 title_(title), |
| 204 directory_resource_id_(directory_resource_id) { | 204 directory_resource_id_(directory_resource_id) { |
| 205 DCHECK(!callback.is_null()); | 205 DCHECK(!callback.is_null()); |
| 206 } | 206 } |
| 207 | 207 |
| 208 SearchByTitleOperation::~SearchByTitleOperation() {} | 208 SearchByTitleOperation::~SearchByTitleOperation() {} |
| 209 | 209 |
| 210 GURL SearchByTitleOperation::GetURL() const { | 210 GURL SearchByTitleOperation::GetURL() const { |
| 211 return url_generator_.GenerateSearchByTitleUrl( | 211 return url_generator_.GenerateSearchByTitleUrl( |
| 212 title_, directory_resource_id_); | 212 title_, directory_resource_id_); |
| 213 } | 213 } |
| 214 | 214 |
| 215 //============================ GetResourceEntryOperation ======================= | 215 //============================ GetResourceEntryOperation ======================= |
| 216 | 216 |
| 217 GetResourceEntryOperation::GetResourceEntryOperation( | 217 GetResourceEntryOperation::GetResourceEntryOperation( |
| 218 OperationRunner* runner, | 218 OperationRunner* runner, |
| 219 net::URLRequestContextGetter* url_request_context_getter, | 219 net::URLRequestContextGetter* url_request_context_getter, |
| 220 const GDataWapiUrlGenerator& url_generator, | 220 const GDataWapiUrlGenerator& url_generator, |
| 221 const std::string& resource_id, | 221 const std::string& resource_id, |
| 222 const GetDataCallback& callback) | 222 const GetDataCallback& callback) |
| 223 : GetDataOperation(runner, url_request_context_getter, callback), | 223 : GetDataRequest(runner, url_request_context_getter, callback), |
| 224 url_generator_(url_generator), | 224 url_generator_(url_generator), |
| 225 resource_id_(resource_id) { | 225 resource_id_(resource_id) { |
| 226 DCHECK(!callback.is_null()); | 226 DCHECK(!callback.is_null()); |
| 227 } | 227 } |
| 228 | 228 |
| 229 GetResourceEntryOperation::~GetResourceEntryOperation() {} | 229 GetResourceEntryOperation::~GetResourceEntryOperation() {} |
| 230 | 230 |
| 231 GURL GetResourceEntryOperation::GetURL() const { | 231 GURL GetResourceEntryOperation::GetURL() const { |
| 232 return url_generator_.GenerateEditUrl(resource_id_); | 232 return url_generator_.GenerateEditUrl(resource_id_); |
| 233 } | 233 } |
| 234 | 234 |
| 235 //========================= GetAccountMetadataOperation ======================== | 235 //========================= GetAccountMetadataOperation ======================== |
| 236 | 236 |
| 237 GetAccountMetadataOperation::GetAccountMetadataOperation( | 237 GetAccountMetadataOperation::GetAccountMetadataOperation( |
| 238 OperationRunner* runner, | 238 OperationRunner* runner, |
| 239 net::URLRequestContextGetter* url_request_context_getter, | 239 net::URLRequestContextGetter* url_request_context_getter, |
| 240 const GDataWapiUrlGenerator& url_generator, | 240 const GDataWapiUrlGenerator& url_generator, |
| 241 const GetAccountMetadataCallback& callback, | 241 const GetAccountMetadataCallback& callback, |
| 242 bool include_installed_apps) | 242 bool include_installed_apps) |
| 243 : GetDataOperation(runner, url_request_context_getter, | 243 : GetDataRequest(runner, url_request_context_getter, |
| 244 base::Bind(&ParseAccounetMetadataAndRun, callback)), | 244 base::Bind(&ParseAccounetMetadataAndRun, callback)), |
| 245 url_generator_(url_generator), | 245 url_generator_(url_generator), |
| 246 include_installed_apps_(include_installed_apps) { | 246 include_installed_apps_(include_installed_apps) { |
| 247 DCHECK(!callback.is_null()); | 247 DCHECK(!callback.is_null()); |
| 248 } | 248 } |
| 249 | 249 |
| 250 GetAccountMetadataOperation::~GetAccountMetadataOperation() {} | 250 GetAccountMetadataOperation::~GetAccountMetadataOperation() {} |
| 251 | 251 |
| 252 GURL GetAccountMetadataOperation::GetURL() const { | 252 GURL GetAccountMetadataOperation::GetURL() const { |
| 253 return url_generator_.GenerateAccountMetadataUrl(include_installed_apps_); | 253 return url_generator_.GenerateAccountMetadataUrl(include_installed_apps_); |
| 254 } | 254 } |
| 255 | 255 |
| 256 //=========================== DeleteResourceOperation ========================== | 256 //=========================== DeleteResourceOperation ========================== |
| 257 | 257 |
| 258 DeleteResourceOperation::DeleteResourceOperation( | 258 DeleteResourceOperation::DeleteResourceOperation( |
| 259 OperationRunner* runner, | 259 OperationRunner* runner, |
| 260 net::URLRequestContextGetter* url_request_context_getter, | 260 net::URLRequestContextGetter* url_request_context_getter, |
| 261 const GDataWapiUrlGenerator& url_generator, | 261 const GDataWapiUrlGenerator& url_generator, |
| 262 const EntryActionCallback& callback, | 262 const EntryActionCallback& callback, |
| 263 const std::string& resource_id, | 263 const std::string& resource_id, |
| 264 const std::string& etag) | 264 const std::string& etag) |
| 265 : EntryActionOperation(runner, url_request_context_getter, callback), | 265 : EntryActionRequest(runner, url_request_context_getter, callback), |
| 266 url_generator_(url_generator), | 266 url_generator_(url_generator), |
| 267 resource_id_(resource_id), | 267 resource_id_(resource_id), |
| 268 etag_(etag) { | 268 etag_(etag) { |
| 269 DCHECK(!callback.is_null()); | 269 DCHECK(!callback.is_null()); |
| 270 } | 270 } |
| 271 | 271 |
| 272 DeleteResourceOperation::~DeleteResourceOperation() {} | 272 DeleteResourceOperation::~DeleteResourceOperation() {} |
| 273 | 273 |
| 274 GURL DeleteResourceOperation::GetURL() const { | 274 GURL DeleteResourceOperation::GetURL() const { |
| 275 return url_generator_.GenerateEditUrl(resource_id_); | 275 return url_generator_.GenerateEditUrl(resource_id_); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 288 | 288 |
| 289 //========================== CreateDirectoryOperation ========================== | 289 //========================== CreateDirectoryOperation ========================== |
| 290 | 290 |
| 291 CreateDirectoryOperation::CreateDirectoryOperation( | 291 CreateDirectoryOperation::CreateDirectoryOperation( |
| 292 OperationRunner* runner, | 292 OperationRunner* runner, |
| 293 net::URLRequestContextGetter* url_request_context_getter, | 293 net::URLRequestContextGetter* url_request_context_getter, |
| 294 const GDataWapiUrlGenerator& url_generator, | 294 const GDataWapiUrlGenerator& url_generator, |
| 295 const GetDataCallback& callback, | 295 const GetDataCallback& callback, |
| 296 const std::string& parent_resource_id, | 296 const std::string& parent_resource_id, |
| 297 const std::string& directory_name) | 297 const std::string& directory_name) |
| 298 : GetDataOperation(runner, url_request_context_getter, callback), | 298 : GetDataRequest(runner, url_request_context_getter, callback), |
| 299 url_generator_(url_generator), | 299 url_generator_(url_generator), |
| 300 parent_resource_id_(parent_resource_id), | 300 parent_resource_id_(parent_resource_id), |
| 301 directory_name_(directory_name) { | 301 directory_name_(directory_name) { |
| 302 DCHECK(!callback.is_null()); | 302 DCHECK(!callback.is_null()); |
| 303 } | 303 } |
| 304 | 304 |
| 305 CreateDirectoryOperation::~CreateDirectoryOperation() {} | 305 CreateDirectoryOperation::~CreateDirectoryOperation() {} |
| 306 | 306 |
| 307 GURL CreateDirectoryOperation::GetURL() const { | 307 GURL CreateDirectoryOperation::GetURL() const { |
| 308 return url_generator_.GenerateContentUrl(parent_resource_id_); | 308 return url_generator_.GenerateContentUrl(parent_resource_id_); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 | 340 |
| 341 //============================ CopyHostedDocumentOperation ===================== | 341 //============================ CopyHostedDocumentOperation ===================== |
| 342 | 342 |
| 343 CopyHostedDocumentOperation::CopyHostedDocumentOperation( | 343 CopyHostedDocumentOperation::CopyHostedDocumentOperation( |
| 344 OperationRunner* runner, | 344 OperationRunner* runner, |
| 345 net::URLRequestContextGetter* url_request_context_getter, | 345 net::URLRequestContextGetter* url_request_context_getter, |
| 346 const GDataWapiUrlGenerator& url_generator, | 346 const GDataWapiUrlGenerator& url_generator, |
| 347 const GetDataCallback& callback, | 347 const GetDataCallback& callback, |
| 348 const std::string& resource_id, | 348 const std::string& resource_id, |
| 349 const std::string& new_name) | 349 const std::string& new_name) |
| 350 : GetDataOperation(runner, url_request_context_getter, callback), | 350 : GetDataRequest(runner, url_request_context_getter, callback), |
| 351 url_generator_(url_generator), | 351 url_generator_(url_generator), |
| 352 resource_id_(resource_id), | 352 resource_id_(resource_id), |
| 353 new_name_(new_name) { | 353 new_name_(new_name) { |
| 354 DCHECK(!callback.is_null()); | 354 DCHECK(!callback.is_null()); |
| 355 } | 355 } |
| 356 | 356 |
| 357 CopyHostedDocumentOperation::~CopyHostedDocumentOperation() {} | 357 CopyHostedDocumentOperation::~CopyHostedDocumentOperation() {} |
| 358 | 358 |
| 359 URLFetcher::RequestType CopyHostedDocumentOperation::GetRequestType() const { | 359 URLFetcher::RequestType CopyHostedDocumentOperation::GetRequestType() const { |
| 360 return URLFetcher::POST; | 360 return URLFetcher::POST; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 386 | 386 |
| 387 //=========================== RenameResourceOperation ========================== | 387 //=========================== RenameResourceOperation ========================== |
| 388 | 388 |
| 389 RenameResourceOperation::RenameResourceOperation( | 389 RenameResourceOperation::RenameResourceOperation( |
| 390 OperationRunner* runner, | 390 OperationRunner* runner, |
| 391 net::URLRequestContextGetter* url_request_context_getter, | 391 net::URLRequestContextGetter* url_request_context_getter, |
| 392 const GDataWapiUrlGenerator& url_generator, | 392 const GDataWapiUrlGenerator& url_generator, |
| 393 const EntryActionCallback& callback, | 393 const EntryActionCallback& callback, |
| 394 const std::string& resource_id, | 394 const std::string& resource_id, |
| 395 const std::string& new_name) | 395 const std::string& new_name) |
| 396 : EntryActionOperation(runner, url_request_context_getter, callback), | 396 : EntryActionRequest(runner, url_request_context_getter, callback), |
| 397 url_generator_(url_generator), | 397 url_generator_(url_generator), |
| 398 resource_id_(resource_id), | 398 resource_id_(resource_id), |
| 399 new_name_(new_name) { | 399 new_name_(new_name) { |
| 400 DCHECK(!callback.is_null()); | 400 DCHECK(!callback.is_null()); |
| 401 } | 401 } |
| 402 | 402 |
| 403 RenameResourceOperation::~RenameResourceOperation() {} | 403 RenameResourceOperation::~RenameResourceOperation() {} |
| 404 | 404 |
| 405 URLFetcher::RequestType RenameResourceOperation::GetRequestType() const { | 405 URLFetcher::RequestType RenameResourceOperation::GetRequestType() const { |
| 406 return URLFetcher::PUT; | 406 return URLFetcher::PUT; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 437 | 437 |
| 438 //=========================== AuthorizeAppOperation ========================== | 438 //=========================== AuthorizeAppOperation ========================== |
| 439 | 439 |
| 440 AuthorizeAppOperation::AuthorizeAppOperation( | 440 AuthorizeAppOperation::AuthorizeAppOperation( |
| 441 OperationRunner* runner, | 441 OperationRunner* runner, |
| 442 net::URLRequestContextGetter* url_request_context_getter, | 442 net::URLRequestContextGetter* url_request_context_getter, |
| 443 const GDataWapiUrlGenerator& url_generator, | 443 const GDataWapiUrlGenerator& url_generator, |
| 444 const AuthorizeAppCallback& callback, | 444 const AuthorizeAppCallback& callback, |
| 445 const std::string& resource_id, | 445 const std::string& resource_id, |
| 446 const std::string& app_id) | 446 const std::string& app_id) |
| 447 : GetDataOperation(runner, url_request_context_getter, | 447 : GetDataRequest(runner, url_request_context_getter, |
| 448 base::Bind(&ParseOpenLinkAndRun, app_id, callback)), | 448 base::Bind(&ParseOpenLinkAndRun, app_id, callback)), |
| 449 url_generator_(url_generator), | 449 url_generator_(url_generator), |
| 450 resource_id_(resource_id), | 450 resource_id_(resource_id), |
| 451 app_id_(app_id) { | 451 app_id_(app_id) { |
| 452 DCHECK(!callback.is_null()); | 452 DCHECK(!callback.is_null()); |
| 453 } | 453 } |
| 454 | 454 |
| 455 AuthorizeAppOperation::~AuthorizeAppOperation() {} | 455 AuthorizeAppOperation::~AuthorizeAppOperation() {} |
| 456 | 456 |
| 457 URLFetcher::RequestType AuthorizeAppOperation::GetRequestType() const { | 457 URLFetcher::RequestType AuthorizeAppOperation::GetRequestType() const { |
| 458 return URLFetcher::PUT; | 458 return URLFetcher::PUT; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 489 | 489 |
| 490 //======================= AddResourceToDirectoryOperation ====================== | 490 //======================= AddResourceToDirectoryOperation ====================== |
| 491 | 491 |
| 492 AddResourceToDirectoryOperation::AddResourceToDirectoryOperation( | 492 AddResourceToDirectoryOperation::AddResourceToDirectoryOperation( |
| 493 OperationRunner* runner, | 493 OperationRunner* runner, |
| 494 net::URLRequestContextGetter* url_request_context_getter, | 494 net::URLRequestContextGetter* url_request_context_getter, |
| 495 const GDataWapiUrlGenerator& url_generator, | 495 const GDataWapiUrlGenerator& url_generator, |
| 496 const EntryActionCallback& callback, | 496 const EntryActionCallback& callback, |
| 497 const std::string& parent_resource_id, | 497 const std::string& parent_resource_id, |
| 498 const std::string& resource_id) | 498 const std::string& resource_id) |
| 499 : EntryActionOperation(runner, url_request_context_getter, callback), | 499 : EntryActionRequest(runner, url_request_context_getter, callback), |
| 500 url_generator_(url_generator), | 500 url_generator_(url_generator), |
| 501 parent_resource_id_(parent_resource_id), | 501 parent_resource_id_(parent_resource_id), |
| 502 resource_id_(resource_id) { | 502 resource_id_(resource_id) { |
| 503 DCHECK(!callback.is_null()); | 503 DCHECK(!callback.is_null()); |
| 504 } | 504 } |
| 505 | 505 |
| 506 AddResourceToDirectoryOperation::~AddResourceToDirectoryOperation() {} | 506 AddResourceToDirectoryOperation::~AddResourceToDirectoryOperation() {} |
| 507 | 507 |
| 508 GURL AddResourceToDirectoryOperation::GetURL() const { | 508 GURL AddResourceToDirectoryOperation::GetURL() const { |
| 509 return url_generator_.GenerateContentUrl(parent_resource_id_); | 509 return url_generator_.GenerateContentUrl(parent_resource_id_); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 535 | 535 |
| 536 //==================== RemoveResourceFromDirectoryOperation ==================== | 536 //==================== RemoveResourceFromDirectoryOperation ==================== |
| 537 | 537 |
| 538 RemoveResourceFromDirectoryOperation::RemoveResourceFromDirectoryOperation( | 538 RemoveResourceFromDirectoryOperation::RemoveResourceFromDirectoryOperation( |
| 539 OperationRunner* runner, | 539 OperationRunner* runner, |
| 540 net::URLRequestContextGetter* url_request_context_getter, | 540 net::URLRequestContextGetter* url_request_context_getter, |
| 541 const GDataWapiUrlGenerator& url_generator, | 541 const GDataWapiUrlGenerator& url_generator, |
| 542 const EntryActionCallback& callback, | 542 const EntryActionCallback& callback, |
| 543 const std::string& parent_resource_id, | 543 const std::string& parent_resource_id, |
| 544 const std::string& document_resource_id) | 544 const std::string& document_resource_id) |
| 545 : EntryActionOperation(runner, url_request_context_getter, callback), | 545 : EntryActionRequest(runner, url_request_context_getter, callback), |
| 546 url_generator_(url_generator), | 546 url_generator_(url_generator), |
| 547 resource_id_(document_resource_id), | 547 resource_id_(document_resource_id), |
| 548 parent_resource_id_(parent_resource_id) { | 548 parent_resource_id_(parent_resource_id) { |
| 549 DCHECK(!callback.is_null()); | 549 DCHECK(!callback.is_null()); |
| 550 } | 550 } |
| 551 | 551 |
| 552 RemoveResourceFromDirectoryOperation::~RemoveResourceFromDirectoryOperation() { | 552 RemoveResourceFromDirectoryOperation::~RemoveResourceFromDirectoryOperation() { |
| 553 } | 553 } |
| 554 | 554 |
| 555 GURL RemoveResourceFromDirectoryOperation::GetURL() const { | 555 GURL RemoveResourceFromDirectoryOperation::GetURL() const { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 574 InitiateUploadNewFileOperation::InitiateUploadNewFileOperation( | 574 InitiateUploadNewFileOperation::InitiateUploadNewFileOperation( |
| 575 OperationRunner* runner, | 575 OperationRunner* runner, |
| 576 net::URLRequestContextGetter* url_request_context_getter, | 576 net::URLRequestContextGetter* url_request_context_getter, |
| 577 const GDataWapiUrlGenerator& url_generator, | 577 const GDataWapiUrlGenerator& url_generator, |
| 578 const InitiateUploadCallback& callback, | 578 const InitiateUploadCallback& callback, |
| 579 const base::FilePath& drive_file_path, | 579 const base::FilePath& drive_file_path, |
| 580 const std::string& content_type, | 580 const std::string& content_type, |
| 581 int64 content_length, | 581 int64 content_length, |
| 582 const std::string& parent_resource_id, | 582 const std::string& parent_resource_id, |
| 583 const std::string& title) | 583 const std::string& title) |
| 584 : InitiateUploadOperationBase(runner, | 584 : InitiateUploadRequestBase(runner, |
| 585 url_request_context_getter, | 585 url_request_context_getter, |
| 586 callback, | 586 callback, |
| 587 drive_file_path, | 587 drive_file_path, |
| 588 content_type, | 588 content_type, |
| 589 content_length), | 589 content_length), |
| 590 url_generator_(url_generator), | 590 url_generator_(url_generator), |
| 591 parent_resource_id_(parent_resource_id), | 591 parent_resource_id_(parent_resource_id), |
| 592 title_(title) { | 592 title_(title) { |
| 593 } | 593 } |
| 594 | 594 |
| 595 InitiateUploadNewFileOperation::~InitiateUploadNewFileOperation() {} | 595 InitiateUploadNewFileOperation::~InitiateUploadNewFileOperation() {} |
| 596 | 596 |
| 597 GURL InitiateUploadNewFileOperation::GetURL() const { | 597 GURL InitiateUploadNewFileOperation::GetURL() const { |
| 598 return url_generator_.GenerateInitiateUploadNewFileUrl(parent_resource_id_); | 598 return url_generator_.GenerateInitiateUploadNewFileUrl(parent_resource_id_); |
| 599 } | 599 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 627 InitiateUploadExistingFileOperation::InitiateUploadExistingFileOperation( | 627 InitiateUploadExistingFileOperation::InitiateUploadExistingFileOperation( |
| 628 OperationRunner* runner, | 628 OperationRunner* runner, |
| 629 net::URLRequestContextGetter* url_request_context_getter, | 629 net::URLRequestContextGetter* url_request_context_getter, |
| 630 const GDataWapiUrlGenerator& url_generator, | 630 const GDataWapiUrlGenerator& url_generator, |
| 631 const InitiateUploadCallback& callback, | 631 const InitiateUploadCallback& callback, |
| 632 const base::FilePath& drive_file_path, | 632 const base::FilePath& drive_file_path, |
| 633 const std::string& content_type, | 633 const std::string& content_type, |
| 634 int64 content_length, | 634 int64 content_length, |
| 635 const std::string& resource_id, | 635 const std::string& resource_id, |
| 636 const std::string& etag) | 636 const std::string& etag) |
| 637 : InitiateUploadOperationBase(runner, | 637 : InitiateUploadRequestBase(runner, |
| 638 url_request_context_getter, | 638 url_request_context_getter, |
| 639 callback, | 639 callback, |
| 640 drive_file_path, | 640 drive_file_path, |
| 641 content_type, | 641 content_type, |
| 642 content_length), | 642 content_length), |
| 643 url_generator_(url_generator), | 643 url_generator_(url_generator), |
| 644 resource_id_(resource_id), | 644 resource_id_(resource_id), |
| 645 etag_(etag) { | 645 etag_(etag) { |
| 646 } | 646 } |
| 647 | 647 |
| 648 InitiateUploadExistingFileOperation::~InitiateUploadExistingFileOperation() {} | 648 InitiateUploadExistingFileOperation::~InitiateUploadExistingFileOperation() {} |
| 649 | 649 |
| 650 GURL InitiateUploadExistingFileOperation::GetURL() const { | 650 GURL InitiateUploadExistingFileOperation::GetURL() const { |
| 651 return url_generator_.GenerateInitiateUploadExistingFileUrl(resource_id_); | 651 return url_generator_.GenerateInitiateUploadExistingFileUrl(resource_id_); |
| 652 } | 652 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 664 // content-type. | 664 // content-type. |
| 665 // As its workaround, send "text/plain" content-type here. | 665 // As its workaround, send "text/plain" content-type here. |
| 666 *upload_content_type = "text/plain"; | 666 *upload_content_type = "text/plain"; |
| 667 *upload_content = ""; | 667 *upload_content = ""; |
| 668 return true; | 668 return true; |
| 669 } | 669 } |
| 670 | 670 |
| 671 std::vector<std::string> | 671 std::vector<std::string> |
| 672 InitiateUploadExistingFileOperation::GetExtraRequestHeaders() const { | 672 InitiateUploadExistingFileOperation::GetExtraRequestHeaders() const { |
| 673 std::vector<std::string> headers( | 673 std::vector<std::string> headers( |
| 674 InitiateUploadOperationBase::GetExtraRequestHeaders()); | 674 InitiateUploadRequestBase::GetExtraRequestHeaders()); |
| 675 headers.push_back(util::GenerateIfMatchHeader(etag_)); | 675 headers.push_back(util::GenerateIfMatchHeader(etag_)); |
| 676 return headers; | 676 return headers; |
| 677 } | 677 } |
| 678 | 678 |
| 679 //============================ ResumeUploadOperation =========================== | 679 //============================ ResumeUploadOperation =========================== |
| 680 | 680 |
| 681 ResumeUploadOperation::ResumeUploadOperation( | 681 ResumeUploadOperation::ResumeUploadOperation( |
| 682 OperationRunner* runner, | 682 OperationRunner* runner, |
| 683 net::URLRequestContextGetter* url_request_context_getter, | 683 net::URLRequestContextGetter* url_request_context_getter, |
| 684 const UploadRangeCallback& callback, | 684 const UploadRangeCallback& callback, |
| 685 const ProgressCallback& progress_callback, | 685 const ProgressCallback& progress_callback, |
| 686 const base::FilePath& drive_file_path, | 686 const base::FilePath& drive_file_path, |
| 687 const GURL& upload_location, | 687 const GURL& upload_location, |
| 688 int64 start_position, | 688 int64 start_position, |
| 689 int64 end_position, | 689 int64 end_position, |
| 690 int64 content_length, | 690 int64 content_length, |
| 691 const std::string& content_type, | 691 const std::string& content_type, |
| 692 const base::FilePath& local_file_path) | 692 const base::FilePath& local_file_path) |
| 693 : ResumeUploadOperationBase(runner, | 693 : ResumeUploadRequestBase(runner, |
| 694 url_request_context_getter, | 694 url_request_context_getter, |
| 695 drive_file_path, | 695 drive_file_path, |
| 696 upload_location, | 696 upload_location, |
| 697 start_position, | 697 start_position, |
| 698 end_position, | 698 end_position, |
| 699 content_length, | 699 content_length, |
| 700 content_type, | 700 content_type, |
| 701 local_file_path), | 701 local_file_path), |
| 702 callback_(callback), | 702 callback_(callback), |
| 703 progress_callback_(progress_callback) { | 703 progress_callback_(progress_callback) { |
| 704 DCHECK(!callback_.is_null()); | 704 DCHECK(!callback_.is_null()); |
| 705 } | 705 } |
| 706 | 706 |
| 707 ResumeUploadOperation::~ResumeUploadOperation() {} | 707 ResumeUploadOperation::~ResumeUploadOperation() {} |
| 708 | 708 |
| 709 void ResumeUploadOperation::OnRangeOperationComplete( | 709 void ResumeUploadOperation::OnRangeRequestComplete( |
| 710 const UploadRangeResponse& response, scoped_ptr<base::Value> value) { | 710 const UploadRangeResponse& response, scoped_ptr<base::Value> value) { |
| 711 callback_.Run(response, ParseResourceEntry(value.Pass())); | 711 callback_.Run(response, ParseResourceEntry(value.Pass())); |
| 712 } | 712 } |
| 713 | 713 |
| 714 void ResumeUploadOperation::OnURLFetchUploadProgress( | 714 void ResumeUploadOperation::OnURLFetchUploadProgress( |
| 715 const URLFetcher* source, int64 current, int64 total) { | 715 const URLFetcher* source, int64 current, int64 total) { |
| 716 if (!progress_callback_.is_null()) | 716 if (!progress_callback_.is_null()) |
| 717 progress_callback_.Run(current, total); | 717 progress_callback_.Run(current, total); |
| 718 } | 718 } |
| 719 | 719 |
| 720 //========================== GetUploadStatusOperation ========================== | 720 //========================== GetUploadStatusOperation ========================== |
| 721 | 721 |
| 722 GetUploadStatusOperation::GetUploadStatusOperation( | 722 GetUploadStatusOperation::GetUploadStatusOperation( |
| 723 OperationRunner* runner, | 723 OperationRunner* runner, |
| 724 net::URLRequestContextGetter* url_request_context_getter, | 724 net::URLRequestContextGetter* url_request_context_getter, |
| 725 const UploadRangeCallback& callback, | 725 const UploadRangeCallback& callback, |
| 726 const base::FilePath& drive_file_path, | 726 const base::FilePath& drive_file_path, |
| 727 const GURL& upload_url, | 727 const GURL& upload_url, |
| 728 int64 content_length) | 728 int64 content_length) |
| 729 : GetUploadStatusOperationBase(runner, | 729 : GetUploadStatusRequestBase(runner, |
| 730 url_request_context_getter, | 730 url_request_context_getter, |
| 731 drive_file_path, | 731 drive_file_path, |
| 732 upload_url, | 732 upload_url, |
| 733 content_length), | 733 content_length), |
| 734 callback_(callback) { | 734 callback_(callback) { |
| 735 DCHECK(!callback.is_null()); | 735 DCHECK(!callback.is_null()); |
| 736 } | 736 } |
| 737 | 737 |
| 738 GetUploadStatusOperation::~GetUploadStatusOperation() {} | 738 GetUploadStatusOperation::~GetUploadStatusOperation() {} |
| 739 | 739 |
| 740 void GetUploadStatusOperation::OnRangeOperationComplete( | 740 void GetUploadStatusOperation::OnRangeRequestComplete( |
| 741 const UploadRangeResponse& response, scoped_ptr<base::Value> value) { | 741 const UploadRangeResponse& response, scoped_ptr<base::Value> value) { |
| 742 callback_.Run(response, ParseResourceEntry(value.Pass())); | 742 callback_.Run(response, ParseResourceEntry(value.Pass())); |
| 743 } | 743 } |
| 744 | 744 |
| 745 } // namespace google_apis | 745 } // namespace google_apis |
| OLD | NEW |