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

Side by Side Diff: chrome/browser/chromeos/drive/file_system.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, 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 | 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/file_system.h" 5 #include "chrome/browser/chromeos/drive/file_system.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 search_operation_.reset(new file_system::SearchOperation( 300 search_operation_.reset(new file_system::SearchOperation(
301 blocking_task_runner_.get(), scheduler_, resource_metadata_)); 301 blocking_task_runner_.get(), scheduler_, resource_metadata_));
302 get_file_for_saving_operation_.reset( 302 get_file_for_saving_operation_.reset(
303 new file_system::GetFileForSavingOperation(blocking_task_runner_.get(), 303 new file_system::GetFileForSavingOperation(blocking_task_runner_.get(),
304 observer, 304 observer,
305 scheduler_, 305 scheduler_,
306 resource_metadata_, 306 resource_metadata_,
307 cache_, 307 cache_,
308 temporary_file_directory_)); 308 temporary_file_directory_));
309 309
310 sync_client_.reset(new internal::SyncClient(blocking_task_runner_.get(),
311 observer,
312 scheduler_,
313 resource_metadata_,
314 cache_,
315 temporary_file_directory_));
316
317 change_list_loader_.reset(new internal::ChangeListLoader( 310 change_list_loader_.reset(new internal::ChangeListLoader(
318 blocking_task_runner_.get(), 311 blocking_task_runner_.get(),
319 resource_metadata_, 312 resource_metadata_,
320 scheduler_, 313 scheduler_,
321 drive_service_)); 314 drive_service_));
322 change_list_loader_->AddObserver(this); 315 change_list_loader_->AddObserver(this);
316
317 sync_client_.reset(new internal::SyncClient(blocking_task_runner_.get(),
318 observer,
319 scheduler_,
320 resource_metadata_,
321 cache_,
322 change_list_loader_.get(),
323 temporary_file_directory_));
323 } 324 }
324 325
325 void FileSystem::CheckForUpdates() { 326 void FileSystem::CheckForUpdates() {
326 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 327 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
327 DVLOG(1) << "CheckForUpdates"; 328 DVLOG(1) << "CheckForUpdates";
328 329
329 change_list_loader_->CheckForUpdates( 330 change_list_loader_->CheckForUpdates(
330 base::Bind(&FileSystem::OnUpdateChecked, weak_ptr_factory_.GetWeakPtr())); 331 base::Bind(&FileSystem::OnUpdateChecked, weak_ptr_factory_.GetWeakPtr()));
331 } 332 }
332 333
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 OpenMode open_mode, 906 OpenMode open_mode,
906 const std::string& mime_type, 907 const std::string& mime_type,
907 const OpenFileCallback& callback) { 908 const OpenFileCallback& callback) {
908 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 909 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
909 DCHECK(!callback.is_null()); 910 DCHECK(!callback.is_null());
910 911
911 open_file_operation_->OpenFile(file_path, open_mode, mime_type, callback); 912 open_file_operation_->OpenFile(file_path, open_mode, mime_type, callback);
912 } 913 }
913 914
914 } // namespace drive 915 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/file_system.h ('k') | chrome/browser/chromeos/drive/file_system/operation_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698