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

Unified Diff: chrome/browser/chromeos/drive/drive_scheduler.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_scheduler.cc
diff --git a/chrome/browser/chromeos/drive/drive_scheduler.cc b/chrome/browser/chromeos/drive/drive_scheduler.cc
index 2a4ea42e485bc9475c1c0def7086b928f5f28742..6150f7681cc3af245bdfe5804c24e38ba8ca921d 100644
--- a/chrome/browser/chromeos/drive/drive_scheduler.cc
+++ b/chrome/browser/chromeos/drive/drive_scheduler.cc
@@ -54,17 +54,17 @@ DriveScheduler::DriveScheduler(
drive_service_(drive_service),
uploader_(new google_apis::DriveUploader(drive_service)),
profile_(profile),
- initialized_(false),
weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
for (int i = 0; i < NUM_QUEUES; ++i) {
jobs_running_[i] = 0;
}
+
+ net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
}
DriveScheduler::~DriveScheduler() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(initialized_);
size_t num_pending_jobs = 0;
size_t num_running_jobs = 0;
@@ -80,18 +80,6 @@ DriveScheduler::~DriveScheduler() {
net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
}
-void DriveScheduler::Initialize() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
- // Initialize() may be called more than once for the lifetime when the
- // file system is remounted.
- if (initialized_)
- return;
-
- net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
- initialized_ = true;
-}
-
std::vector<JobInfo> DriveScheduler::GetJobInfoList() {
std::vector<JobInfo> job_info_list;
for (JobIDMap::iterator iter(&job_map_); !iter.IsAtEnd(); iter.Advance())
« no previous file with comments | « chrome/browser/chromeos/drive/drive_scheduler.h ('k') | chrome/browser/chromeos/drive/drive_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698