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

Side by Side Diff: chrome/browser/chromeos/drive/sync_client.cc

Issue 148233006: drive: Use UploadNewFile from EntryUpdatePerformer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 6 years, 11 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 (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/chromeos/drive/sync_client.h" 5 #include "chrome/browser/chromeos/drive/sync_client.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } // namespace 129 } // namespace
130 130
131 SyncClient::SyncTask::SyncTask() : state(PENDING), should_run_again(false) {} 131 SyncClient::SyncTask::SyncTask() : state(PENDING), should_run_again(false) {}
132 SyncClient::SyncTask::~SyncTask() {} 132 SyncClient::SyncTask::~SyncTask() {}
133 133
134 SyncClient::SyncClient(base::SequencedTaskRunner* blocking_task_runner, 134 SyncClient::SyncClient(base::SequencedTaskRunner* blocking_task_runner,
135 file_system::OperationObserver* observer, 135 file_system::OperationObserver* observer,
136 JobScheduler* scheduler, 136 JobScheduler* scheduler,
137 ResourceMetadata* metadata, 137 ResourceMetadata* metadata,
138 FileCache* cache, 138 FileCache* cache,
139 ChangeListLoader* change_list_loader,
139 const base::FilePath& temporary_file_directory) 140 const base::FilePath& temporary_file_directory)
140 : blocking_task_runner_(blocking_task_runner), 141 : blocking_task_runner_(blocking_task_runner),
141 operation_observer_(observer), 142 operation_observer_(observer),
142 metadata_(metadata), 143 metadata_(metadata),
143 cache_(cache), 144 cache_(cache),
144 download_operation_(new file_system::DownloadOperation( 145 download_operation_(new file_system::DownloadOperation(
145 blocking_task_runner, 146 blocking_task_runner,
146 observer, 147 observer,
147 scheduler, 148 scheduler,
148 metadata, 149 metadata,
149 cache, 150 cache,
150 temporary_file_directory)), 151 temporary_file_directory)),
151 entry_update_performer_(new EntryUpdatePerformer(blocking_task_runner, 152 entry_update_performer_(new EntryUpdatePerformer(blocking_task_runner,
152 observer, 153 observer,
153 scheduler, 154 scheduler,
154 metadata, 155 metadata,
155 cache)), 156 cache,
157 change_list_loader)),
156 delay_(base::TimeDelta::FromSeconds(kDelaySeconds)), 158 delay_(base::TimeDelta::FromSeconds(kDelaySeconds)),
157 long_delay_(base::TimeDelta::FromSeconds(kLongDelaySeconds)), 159 long_delay_(base::TimeDelta::FromSeconds(kLongDelaySeconds)),
158 weak_ptr_factory_(this) { 160 weak_ptr_factory_(this) {
159 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 161 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
160 } 162 }
161 163
162 SyncClient::~SyncClient() { 164 SyncClient::~SyncClient() {
163 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 165 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
164 } 166 }
165 167
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 file_system::DRIVE_SYNC_ERROR_MISC, 416 file_system::DRIVE_SYNC_ERROR_MISC,
415 local_id); 417 local_id);
416 LOG(WARNING) << "Failed to update " << local_id << ": " 418 LOG(WARNING) << "Failed to update " << local_id << ": "
417 << FileErrorToString(error); 419 << FileErrorToString(error);
418 } 420 }
419 } 421 }
420 } 422 }
421 423
422 } // namespace internal 424 } // namespace internal
423 } // namespace drive 425 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/sync_client.h ('k') | chrome/browser/chromeos/drive/sync_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698