Enrich fileBrowserPrivate.onFileTransfersUpdated event to support displaying total number of jobs.

chrome/browser/chromeos/extensions/file_manager/event_router.cc

Index: chrome/browser/chromeos/extensions/file_manager/event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 83e1f144e3411613540a81fde51c93277b7299fb..50f675c49d7c09b7b6116c94eb50b5b7ee39ff8f 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -10,6 +10,7 @@
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ -61,6 +62,7 @@ namespace file_browser_private = extensions::api::file_browser_private;
 namespace file_manager {
 namespace {
 // Constants for the "transferState" field of onFileTransferUpdated event.
+const char kFileTransferStateAdded[] = "added";
 const char kFileTransferStateStarted[] = "started";
 const char kFileTransferStateInProgress[] = "in_progress";
 const char kFileTransferStateCompleted[] = "completed";
@@ -98,6 +100,7 @@ void JobInfoToTransferStatus(
       IsUploadJob(job_info.job_type) ?
       file_browser_private::TRANSFER_TYPE_UPLOAD :
       file_browser_private::TRANSFER_TYPE_DOWNLOAD;
+  status->num_total_jobs = job_info.num_total_jobs;
   // JavaScript does not have 64-bit integers. Instead we use double, which
   // is in IEEE 754 formant and accurate up to 52-bits in JS, and in practice
   // in C++. Larger values are rounded.
@@ -364,6 +367,10 @@ EventRouter::DriveJobInfoWithStatus::DriveJobInfoWithStatus(
     : job_info(info), status(status) {
 }
 
+bool EventRouter::DriveJobInfoWithStatus::empty() {
+  return status.empty();
+}
+
 EventRouter::EventRouter(Profile* profile)
     : pref_change_registrar_(new PrefChangeRegistrar),
       profile_(profile),
@@ -620,7 +627,11 @@ void EventRouter::OnFileManagerPrefsChanged() {
 
 void EventRouter::OnJobAdded(const drive::JobInfo& job_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  OnJobUpdated(job_info);
+  if (!drive::IsActiveFileTransferJobInfo(job_info))
+    return;
+  DriveJobInfoWithStatus job_info_with_status =
+      DriveJobInfoWithStatus(job_info, kFileTransferStateAdded);
+  ScheduleEvent(job_info_with_status, false /* immediate */);
 }
 
 void EventRouter::OnJobUpdated(const drive::JobInfo& job_info) {
@@ -635,9 +646,7 @@ void EventRouter::OnJobUpdated(const drive::JobInfo& job_info) {
       job_info,
       is_new_job ? kFileTransferStateStarted : kFileTransferStateInProgress);
 
-  // Fire event if needed.
-  bool always = is_new_job;
-  SendDriveFileTransferEvent(always);
+  ScheduleEvent(drive_jobs_[job_info.job_id], false /* immediate */);
 }
 
 void EventRouter::OnJobDone(const drive::JobInfo& job_info,
@@ -652,41 +661,64 @@ void EventRouter::OnJobDone(const drive::JobInfo& job_info,
       error == drive::FILE_ERROR_OK ? kFileTransferStateCompleted
       : kFileTransferStateFailed);
 
-  // Fire event if needed.
-  bool always = true;
-  SendDriveFileTransferEvent(always);
+  ScheduleEvent(drive_jobs_[job_info.job_id], true /* immediate */);
 
   // Forget about the job.
   drive_jobs_.erase(job_info.job_id);
 }
 
-void EventRouter::SendDriveFileTransferEvent(bool always) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+void EventRouter::ScheduleEvent(DriveJobInfoWithStatus& job_info_with_status,
+                                bool immediate) {
+  // Update next send time.
+  base::Time now = base::Time::Now();
+  if (immediate) {
+    nextSendTime_ = now;
+  } else if (drive_job_info_with_status_.empty()) {
+    nextSendTime_ =
+        std::max(now + base::TimeDelta::FromMilliseconds(100), nextSendTime_);
+  }
 
-  // When |always| flag is not set, we don't send the event until certain
-  // amount of time passes after the previous one. This is to avoid
-  // flooding the IPC between extensions by many onFileTransferUpdated events.
-  if (!ShouldSendProgressEvent(always, &last_file_transfer_event_))
+  // Update the latest event.
+  drive_job_info_with_status_ = job_info_with_status;
+
+  // Schedule event.
+  if (nextSendTime_ < now) {
+    SendDriveFileTransferEvent();
+  } else {
+    base::TimeDelta delta = nextSendTime_ - now;
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&EventRouter::SendDriveFileTransferEvent,
+                   weak_factory_.GetWeakPtr()),
+        delta);
+  }
+}
+
+void EventRouter::SendDriveFileTransferEvent() {
+  base::Time now = base::Time::Now();
+  if (now < nextSendTime_ || drive_job_info_with_status_.empty())
     return;
 
-  // Convert the current |drive_jobs_| to IDL type.
+  // Convert the drive_job_info_with_status_ to IDL type.
   std::vector<linked_ptr<file_browser_private::FileTransferStatus> >
       status_list;
-  for (std::map<drive::JobID, DriveJobInfoWithStatus>::iterator
-           iter = drive_jobs_.begin(); iter != drive_jobs_.end(); ++iter) {
-    linked_ptr<file_browser_private::FileTransferStatus> status(
-        new file_browser_private::FileTransferStatus());
-    JobInfoToTransferStatus(profile_,
-                            kFileManagerAppId,
-                            iter->second.status,
-                            iter->second.job_info,
-                            status.get());
-    status_list.push_back(status);
-  }
+
+  linked_ptr<file_browser_private::FileTransferStatus> status(
+      new file_browser_private::FileTransferStatus());
+  JobInfoToTransferStatus(profile_,
+                          kFileManagerAppId,
+                          drive_job_info_with_status_.status,
+                          drive_job_info_with_status_.job_info,
+                          status.get());
+  status_list.push_back(status);
+
   BroadcastEvent(
       profile_,
       file_browser_private::OnFileTransfersUpdated::kEventName,
       file_browser_private::OnFileTransfersUpdated::Create(status_list));
+
+  drive_job_info_with_status_.status.clear();

[hirono, 2014/09/01 03:53:44]

nit: How about using scoped_ptr instead of using an empty string as a marker of
empty drive job info?

[iseki, 2014/09/01 06:45:40]

Done.

+  nextSendTime_ = now + base::TimeDelta::FromMilliseconds(1000);
 }
 
 void EventRouter::OnDirectoryChanged(const base::FilePath& drive_path) {