Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / job_scheduler.h

diff --git a/src/chrome/browser/chromeos/drive/job_scheduler.h b/src/chrome/browser/chromeos/drive/job_scheduler.h
index cd21030..ea2ca59 100644 (file)
--- a/src/chrome/browser/chromeos/drive/job_scheduler.h
+++ b/src/chrome/browser/chromeos/drive/job_scheduler.h
@@ -69,11 +69,11 @@ class JobScheduler
   virtual ~JobScheduler();
 
   // JobListInterface overrides.
-  virtual std::vector<JobInfo> GetJobInfoList() OVERRIDE;
-  virtual void AddObserver(JobListObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(JobListObserver* observer) OVERRIDE;
-  virtual void CancelJob(JobID job_id) OVERRIDE;
-  virtual void CancelAllJobs() OVERRIDE;
+  virtual std::vector<JobInfo> GetJobInfoList() override;
+  virtual void AddObserver(JobListObserver* observer) override;
+  virtual void RemoveObserver(JobListObserver* observer) override;
+  virtual void CancelJob(JobID job_id) override;
+  virtual void CancelAllJobs() override;
 
   // Adds a GetAppList operation to the queue.
   // |callback| must not be null.
@@ -342,7 +342,7 @@ class JobScheduler
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver override.
   virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Get the type of queue the specified job should be put in.
   QueueType GetJobQueueType(JobType type);
@@ -388,6 +388,7 @@ class JobScheduler
 
   EventLogger* logger_;
   DriveServiceInterface* drive_service_;
+  base::SequencedTaskRunner* blocking_task_runner_;
   scoped_ptr<DriveUploaderInterface> uploader_;
 
   PrefService* pref_service_;