Prefer opening Downloads Home showing prefetched articles

When opening the Downloads Home from the dino/offline page, if there are available prefetched articles, it should be opened focusing on presenting them. Bug: 852872 Change-Id: Icccc4669fe4c5d2b44676fefb3a691a2b35c11cc Reviewed-on: https://chromium-review.googlesource.com/1196015 Reviewed-by: Min Qin <qinmin@chromium.org> Reviewed-by: Dan H <harringtond@google.com> Commit-Queue: Carlos Knippschild <carlosk@chromium.org> Cr-Commit-Position: refs/heads/master@{#587373}
hylschwy · Aug 30, 2018 · 80999dd · 80999dd
1 parent d99176f
commit 80999dd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java
@@ -1663,8 +1663,8 @@ private void onDownloadItemRemoved(String guid, boolean isOffTheRecord) {
     }
 
     @CalledByNative
-    private void showDownloadManager() {
-        DownloadManagerService.openDownloadsPage(ContextUtils.getApplicationContext());
+    private void showDownloadManager(boolean showPrefetchedContent) {
+        DownloadUtils.showDownloadManager(null, null, showPrefetchedContent);
     }
 
     @CalledByNative

diff --git a/chrome/browser/android/download/available_offline_content_provider.cc b/chrome/browser/android/download/available_offline_content_provider.cc
@@ -219,7 +219,8 @@ void AvailableOfflineContentProvider::LaunchItem(
 }
 
 void AvailableOfflineContentProvider::LaunchDownloadsPage() {
-  DownloadManagerService::GetInstance()->ShowDownloadManager();
+  DownloadManagerService::GetInstance()->ShowDownloadManager(
+      has_prefetched_content_);
 }
 
 void AvailableOfflineContentProvider::Create(
@@ -251,6 +252,7 @@ void AvailableOfflineContentProvider::SummarizeFinalize(
       summary->has_audio = true;
     }
   }
+  has_prefetched_content_ = summary->has_prefetched_page;
   std::move(callback).Run(std::move(summary));
 }
 

diff --git a/chrome/browser/android/download/available_offline_content_provider.h b/chrome/browser/android/download/available_offline_content_provider.h
@@ -52,6 +52,11 @@ class AvailableOfflineContentProvider
 
   content::BrowserContext* browser_context_;
 
+  // Records if the last content fetch indicated that prefetched articles are
+  // available or not.
+  // TODO(carlosk): Directly check the existence of prefetched articles.
+  bool has_prefetched_content_ = false;
+
   base::WeakPtrFactory<AvailableOfflineContentProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AvailableOfflineContentProvider);

diff --git a/chrome/browser/android/download/download_manager_service.cc b/chrome/browser/android/download/download_manager_service.cc
@@ -218,9 +218,10 @@ DownloadManagerService::RetriveInProgressDownloadManager(
   return nullptr;
 }
 
-void DownloadManagerService::ShowDownloadManager() {
+void DownloadManagerService::ShowDownloadManager(bool show_prefetched_content) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_DownloadManagerService_showDownloadManager(env, java_ref_);
+  Java_DownloadManagerService_showDownloadManager(
+      env, java_ref_, static_cast<jboolean>(show_prefetched_content));
 }
 
 void DownloadManagerService::OpenDownload(download::DownloadItem* download,

diff --git a/chrome/browser/android/download/download_manager_service.h b/chrome/browser/android/download/download_manager_service.h
@@ -61,8 +61,9 @@ class DownloadManagerService
   // Called when full browser process starts.
   void OnFullBrowserStarted(JNIEnv* env, jobject obj);
 
-  // Called to show the download manager.
-  void ShowDownloadManager();
+  // Called to show the download manager, with a choice to focus on prefetched
+  // content instead of regular downloads.
+  void ShowDownloadManager(bool show_prefetched_content);
 
   // Called to open a given download item.
   void OpenDownload(download::DownloadItem* download, int source);