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

Unified Diff: chrome/browser/chromeos/drive/drive_file_system.cc

Issue 14118006: Change owner of DriveScheduler from DriveFileSystem to DriveSystemService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/drive_file_system.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index 6a602254e7efcebb8242be1b0dc23d4fed8da604..8b971358b9777b523c417d2e9e12bb3e863702cc 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -211,18 +211,19 @@ DriveFileSystem::DriveFileSystem(
Profile* profile,
DriveCache* cache,
google_apis::DriveServiceInterface* drive_service,
+ DriveScheduler* scheduler,
DriveWebAppsRegistry* webapps_registry,
DriveResourceMetadata* resource_metadata,
base::SequencedTaskRunner* blocking_task_runner)
: profile_(profile),
cache_(cache),
drive_service_(drive_service),
+ scheduler_(scheduler),
webapps_registry_(webapps_registry),
resource_metadata_(resource_metadata),
last_update_check_error_(DRIVE_FILE_OK),
hide_hosted_docs_(false),
blocking_task_runner_(blocking_task_runner),
- scheduler_(new DriveScheduler(profile, drive_service)),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
// Should be created from the file browser extension API on UI thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -239,7 +240,7 @@ void DriveFileSystem::Initialize() {
SetupChangeListLoader();
// Allocate the drive operation handlers.
- drive_operations_.Init(scheduler_.get(),
+ drive_operations_.Init(scheduler_,
this, // DriveFileSystemInterface
cache_,
resource_metadata_,
@@ -249,8 +250,6 @@ void DriveFileSystem::Initialize() {
PrefService* pref_service = profile_->GetPrefs();
hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableDriveHostedFiles);
- scheduler_->Initialize();
-
InitializePreferenceObserver();
}
@@ -265,7 +264,7 @@ void DriveFileSystem::ReloadAfterReset() {
void DriveFileSystem::SetupChangeListLoader() {
change_list_loader_.reset(new ChangeListLoader(resource_metadata_,
- scheduler_.get(),
+ scheduler_,
webapps_registry_));
change_list_loader_->AddObserver(this);
}
« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_system.h ('k') | chrome/browser/chromeos/drive/drive_file_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698