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

Side by Side Diff: components/drive/drive_uploader.cc

Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing... Created 5 years, 5 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 | « components/drive/drive_uploader.h ('k') | components/drive/drive_uploader_unittest.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 #include "chrome/browser/drive/drive_uploader.h" 5 #include "components/drive/drive_uploader.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/task_runner_util.h" 14 #include "base/task_runner_util.h"
15 #include "chrome/browser/drive/drive_service_interface.h" 15 #include "components/drive/service/drive_service_interface.h"
16 #include "content/public/browser/power_save_blocker.h" 16 #include "content/public/browser/power_save_blocker.h"
17 #include "google_apis/drive/drive_api_parser.h" 17 #include "google_apis/drive/drive_api_parser.h"
18 18
19 using google_apis::CancelCallback; 19 using google_apis::CancelCallback;
20 using google_apis::FileResource; 20 using google_apis::FileResource;
21 using google_apis::DRIVE_CANCELLED; 21 using google_apis::DRIVE_CANCELLED;
22 using google_apis::DriveApiErrorCode; 22 using google_apis::DriveApiErrorCode;
23 using google_apis::DRIVE_NO_SPACE; 23 using google_apis::DRIVE_NO_SPACE;
24 using google_apis::HTTP_CONFLICT; 24 using google_apis::HTTP_CONFLICT;
25 using google_apis::HTTP_CREATED; 25 using google_apis::HTTP_CREATED;
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 } else { 524 } else {
525 DVLOG(1) << "Upload failed " << upload_file_info->DebugString(); 525 DVLOG(1) << "Upload failed " << upload_file_info->DebugString();
526 if (error == HTTP_PRECONDITION) 526 if (error == HTTP_PRECONDITION)
527 error = HTTP_CONFLICT; // ETag mismatch. 527 error = HTTP_CONFLICT; // ETag mismatch.
528 upload_file_info->completion_callback.Run( 528 upload_file_info->completion_callback.Run(
529 error, upload_file_info->upload_location, scoped_ptr<FileResource>()); 529 error, upload_file_info->upload_location, scoped_ptr<FileResource>());
530 } 530 }
531 } 531 }
532 532
533 } // namespace drive 533 } // namespace drive
OLDNEW
« no previous file with comments | « components/drive/drive_uploader.h ('k') | components/drive/drive_uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698