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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/create_file_operation.cc

Issue 14755002: drive: Drop "Drive" from FakeDriveFileSystem and MockDriveFileSystem (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: some more cleanup Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/drive/file_system/create_file_operation.h" 5 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "chrome/browser/chromeos/drive/drive.pb.h" 9 #include "chrome/browser/chromeos/drive/drive.pb.h"
10 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" 10 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
11 #include "chrome/browser/chromeos/drive/file_system_util.h" 11 #include "chrome/browser/chromeos/drive/file_system_util.h"
12 #include "chrome/browser/chromeos/drive/job_scheduler.h" 12 #include "chrome/browser/chromeos/drive/job_scheduler.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "net/base/mime_util.h" 14 #include "net/base/mime_util.h"
15 15
16 using content::BrowserThread; 16 using content::BrowserThread;
17 17
18 namespace drive { 18 namespace drive {
19 namespace file_system { 19 namespace file_system {
20 20
21 namespace { 21 namespace {
22 22
23 const char kMimeTypeOctetStream[] = "application/octet-stream"; 23 const char kMimeTypeOctetStream[] = "application/octet-stream";
24 24
25 } // namespace 25 } // namespace
26 26
27 CreateFileOperation::CreateFileOperation( 27 CreateFileOperation::CreateFileOperation(
28 JobScheduler* job_scheduler, 28 JobScheduler* job_scheduler,
29 DriveFileSystemInterface* drive_file_system, 29 DriveFileSystemInterface* file_system,
30 internal::ResourceMetadata* metadata, 30 internal::ResourceMetadata* metadata,
31 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) 31 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
32 : job_scheduler_(job_scheduler), 32 : job_scheduler_(job_scheduler),
33 drive_file_system_(drive_file_system), 33 file_system_(file_system),
34 metadata_(metadata), 34 metadata_(metadata),
35 blocking_task_runner_(blocking_task_runner), 35 blocking_task_runner_(blocking_task_runner),
36 weak_ptr_factory_(this) { 36 weak_ptr_factory_(this) {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
38 } 38 }
39 39
40 CreateFileOperation::~CreateFileOperation() { 40 CreateFileOperation::~CreateFileOperation() {
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
42 } 42 }
43 43
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void CreateFileOperation::CreateFileAfterUpload( 136 void CreateFileOperation::CreateFileAfterUpload(
137 const FileOperationCallback& callback, 137 const FileOperationCallback& callback,
138 google_apis::GDataErrorCode error, 138 google_apis::GDataErrorCode error,
139 const base::FilePath& drive_path, 139 const base::FilePath& drive_path,
140 const base::FilePath& local_path, 140 const base::FilePath& local_path,
141 scoped_ptr<google_apis::ResourceEntry> resource_entry) { 141 scoped_ptr<google_apis::ResourceEntry> resource_entry) {
142 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 142 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
143 DCHECK(!callback.is_null()); 143 DCHECK(!callback.is_null());
144 144
145 if (error == google_apis::HTTP_SUCCESS && resource_entry) { 145 if (error == google_apis::HTTP_SUCCESS && resource_entry) {
146 drive_file_system_->AddUploadedFile(resource_entry.Pass(), 146 file_system_->AddUploadedFile(resource_entry.Pass(),
147 local_path, 147 local_path,
148 callback); 148 callback);
149 } else { 149 } else {
150 callback.Run(util::GDataToFileError(error)); 150 callback.Run(util::GDataToFileError(error));
151 } 151 }
152 } 152 }
153 153
154 } // namespace file_system 154 } // namespace file_system
155 } // namespace drive 155 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698