[Download Home] Properly enqueue download requests

chrome/browser/android/download/download_manager_service.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/download/download_manager_service.h"
 
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 64 matching lines @@
   DownloadHistory* history = download_service->GetDownloadHistory();
   if (history)
     history->AddObserver(service);
   return reinterpret_cast<intptr_t>(service);
 }
 
 DownloadManagerService::DownloadManagerService(
     JNIEnv* env,
     jobject obj)
     : java_ref_(env, obj),
-      is_history_query_complete_(false) {
+      is_history_query_complete_(false),
+      pending_get_downloads_actions_(NONE) {
   DownloadControllerBase::Get()->SetDefaultDownloadFileName(
       l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
 }
 
 DownloadManagerService::~DownloadManagerService() {}
 
 void DownloadManagerService::ResumeDownload(
     JNIEnv* env,
     jobject obj,
     const JavaParamRef<jstring>& jdownload_guid,
@@ skipping 28 matching lines @@
   else
     EnqueueDownloadAction(download_guid, REMOVE);
 }
 
 void DownloadManagerService::GetAllDownloads(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj,
                                              bool is_off_the_record) {
   if (is_history_query_complete_)
     GetAllDownloadsInternal(is_off_the_record);
   else if (is_off_the_record)
-    EnqueueDownloadAction(std::string(), INITIALIZE_OFF_THE_RECORD_UI);
+    pending_get_downloads_actions_ |= OFF_THE_RECORD;
   else
-    EnqueueDownloadAction(std::string(), INITIALIZE_UI);
+    pending_get_downloads_actions_ |= REGULAR;
 }
 
 void DownloadManagerService::GetAllDownloadsInternal(bool is_off_the_record) {
   content::DownloadManager* manager = GetDownloadManager(is_off_the_record);
   if (java_ref_.is_null() || !manager)
     return;
 
   content::DownloadManager::DownloadVector all_items;
   manager->GetAllDownloads(&all_items);
 
@@ skipping 64 matching lines @@
     switch (action) {
       case RESUME:
         ResumeDownloadInternal(download_guid, false);
         break;
       case PAUSE:
         PauseDownloadInternal(download_guid, false);
         break;
       case CANCEL:
         CancelDownloadInternal(download_guid, false);
         break;
-      case INITIALIZE_UI:
-        GetAllDownloadsInternal(false);
-        break;
-      case INITIALIZE_OFF_THE_RECORD_UI:
-        GetAllDownloadsInternal(true);
-        break;
       default:
         NOTREACHED();
         break;
     }
   }
   pending_actions_.clear();
 
+  // Respond to any requests to get all downloads.
+  if (pending_get_downloads_actions_ & REGULAR)
+    GetAllDownloadsInternal(false);
+  if (pending_get_downloads_actions_ & OFF_THE_RECORD)
+    GetAllDownloadsInternal(true);
+
   // Monitor all DownloadItems for changes.
   updateNotifier(this, GetDownloadManager(false), original_notifier_);
   updateNotifier(this, GetDownloadManager(true), off_the_record_notifier_);
 }
 
 void DownloadManagerService::OnDownloadUpdated(
     content::DownloadManager* manager, content::DownloadItem* item) {
   if (java_ref_.is_null())
     return;
 
@@ skipping 100 matching lines @@
     case PAUSE:
       if (iter->second == RESUME)
         iter->second = action;
       break;
     case CANCEL:
       iter->second = action;
       break;
     case REMOVE:
       iter->second = action;
       break;
-    case INITIALIZE_UI:
-    case INITIALIZE_OFF_THE_RECORD_UI:
-      iter->second = action;
-      break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void DownloadManagerService::OnResumptionFailed(
     const std::string& download_guid) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&DownloadManagerService::OnResumptionFailedInternal,
@@ skipping 21 matching lines @@
   content::DownloadManager* manager =
       content::BrowserContext::GetDownloadManager(profile);
 
   // Update notifiers to monitor any newly created DownloadManagers.
   updateNotifier(
       this, manager,
       is_off_the_record ? off_the_record_notifier_ : original_notifier_);
 
   return manager;
 }