implementation for new duplicate download UI

chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc

 // Copyright 2016 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/offline_pages/downloads/offline_page_download_bridge.h"
 
 #include <vector>
 
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 39 matching lines @@
 content::WebContents* GetWebContentsFromJavaTab(
     const ScopedJavaGlobalRef<jobject>& j_tab_ref) {
   JNIEnv* env = AttachCurrentThread();
   TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab_ref);
   if (!tab)
     return nullptr;
 
   return tab->web_contents();
 }
 
-// TODO(dewittj): Move to Download UI Adapter.
-OfflinePageModel* GetOfflinePageModelFromJavaTab(
-    const ScopedJavaGlobalRef<jobject>& j_tab_ref) {
-  content::WebContents* web_contents = GetWebContentsFromJavaTab(j_tab_ref);
-  if (!web_contents)
-    return nullptr;
-
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext())
-          ->GetOriginalProfile();
-
-  return OfflinePageModelFactory::GetForBrowserContext(profile);
-}
-
 void SavePageIfNotNavigatedAway(const GURL& original_url,
                                 const ScopedJavaGlobalRef<jobject>& j_tab_ref) {
   content::WebContents* web_contents = GetWebContentsFromJavaTab(j_tab_ref);
   if (!web_contents)
     return;
 
   // This ignores fragment differences in URLs, bails out only if tab has
   // navigated away and not just scrolled to a fragment.
   GURL url = web_contents->GetLastCommittedURL();
   if (!OfflinePageUtils::EqualsIgnoringFragment(url, original_url))
@@ skipping 32 matching lines @@
       request_coordinator->EnableForOffliner(request_id);
     }
     return;
   }
   tab_helper->ObserveAndDownloadCurrentPage(client_id, request_id);
 
   OfflinePageNotificationBridge notification_bridge;
   notification_bridge.ShowDownloadingToast();
 }
 
-void OnDeletePagesForInfoBar(const GURL& original_url,
-                             const ScopedJavaGlobalRef<jobject>& j_tab_ref,
-                             DeletePageResult result) {
-  SavePageIfNotNavigatedAway(original_url, j_tab_ref);
-}
-
-void DeletePagesForOverwrite(const GURL& original_url,
-                             const ScopedJavaGlobalRef<jobject>& j_tab_ref,
-                             const MultipleOfflinePageItemResult& pages) {
-  OfflinePageModel* model = GetOfflinePageModelFromJavaTab(j_tab_ref);
-  if (!model)
-    return;
-
-  std::vector<int64_t> offline_ids;
-  for (auto& page : pages) {
-    if (page.client_id.name_space == kDownloadNamespace ||
-        page.client_id.name_space == kAsyncNamespace) {
-      offline_ids.emplace_back(page.offline_id);
-    }
-  }
-
-  model->DeletePagesByOfflineId(
-      offline_ids, base::Bind(
-          &OnDeletePagesForInfoBar, original_url, j_tab_ref));
-}
-
-void OnInfoBarAction(const GURL& original_url,
-                     const ScopedJavaGlobalRef<jobject>& j_tab_ref,
-                     OfflinePageInfoBarDelegate::Action action) {
-  switch (action) {
-    case OfflinePageInfoBarDelegate::Action::CREATE_NEW:
-      SavePageIfNotNavigatedAway(original_url, j_tab_ref);
-      break;
-    case OfflinePageInfoBarDelegate::Action::OVERWRITE:
-      OfflinePageModel* offline_page_model =
-          GetOfflinePageModelFromJavaTab(j_tab_ref);
-      if (!offline_page_model)
-        return;
-
-      offline_page_model->GetPagesByOnlineURL(
-          original_url,
-          base::Bind(&DeletePagesForOverwrite, original_url, j_tab_ref));
-      break;
-  }
-}
-
 void RequestQueueDuplicateCheckDone(
     const GURL& original_url,
     const ScopedJavaGlobalRef<jobject>& j_tab_ref,
     bool has_duplicates) {
   if (has_duplicates) {
     // TODO(fgorski): Additionally we could update existing request's expiration
     // period, as it is still important. Alternative would be to actually take a
     // snapshot on the spot, but that would only work if the page is loaded
     // enough.
     // This simply toasts that the item is downloading.
     OfflinePageNotificationBridge notification_bridge;
     notification_bridge.ShowDownloadingToast();
     return;
   }
 
   SavePageIfNotNavigatedAway(original_url, j_tab_ref);
 }
 
 void ModelDuplicateCheckDone(const GURL& original_url,
                              const ScopedJavaGlobalRef<jobject>& j_tab_ref,
-                             const std::string& downloads_label,
                              bool has_duplicates) {
   content::WebContents* web_contents = GetWebContentsFromJavaTab(j_tab_ref);
   if (!web_contents)
     return;
 
   if (has_duplicates) {
     OfflinePageInfoBarDelegate::Create(
-        base::Bind(&OnInfoBarAction, original_url, j_tab_ref), downloads_label,
+        base::Bind(&SavePageIfNotNavigatedAway, original_url, j_tab_ref),
         original_url, web_contents);
     return;
   }
 
   OfflinePageUtils::CheckExistenceOfRequestsWithURL(
       Profile::FromBrowserContext(web_contents->GetBrowserContext())
           ->GetOriginalProfile(),
       kDownloadNamespace, original_url,
       base::Bind(&RequestQueueDuplicateCheckDone, original_url, j_tab_ref));
 }
@@ skipping 145 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_guid) {
   std::string guid = ConvertJavaStringToUTF8(env, j_guid);
   return download_ui_adapter_->GetOfflineIdByGuid(guid);
 }
 
 void OfflinePageDownloadBridge::StartDownload(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& j_tab,
-    const JavaParamRef<jstring>& j_downloads_label) {
-  std::string downloads_label = ConvertJavaStringToUTF8(env, j_downloads_label);
+    const JavaParamRef<jobject>& j_tab) {
   TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab);
   if (!tab)
     return;
 
   content::WebContents* web_contents = tab->web_contents();
   if (!web_contents)
     return;
 
   GURL url = web_contents->GetLastCommittedURL();
 
   ScopedJavaGlobalRef<jobject> j_tab_ref(env, j_tab);
 
   OfflinePageUtils::CheckExistenceOfPagesWithURL(
       tab->GetProfile()->GetOriginalProfile(), kDownloadNamespace, url,
-      base::Bind(&ModelDuplicateCheckDone, url, j_tab_ref, downloads_label));
+      base::Bind(&ModelDuplicateCheckDone, url, j_tab_ref));
 }
 
 void OfflinePageDownloadBridge::CancelDownload(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_guid) {
   std::string guid = ConvertJavaStringToUTF8(env, j_guid);
   RequestCoordinator* coordinator =
       RequestCoordinatorFactory::GetForBrowserContext(browser_context_);
 
@@ skipping 83 matching lines @@
 
   DownloadUIAdapter* adapter =
       DownloadUIAdapter::FromOfflinePageModel(offline_page_model);
 
   return reinterpret_cast<jlong>(
       new OfflinePageDownloadBridge(env, obj, adapter, browser_context));
 }
 
 }  // namespace android
 }  // namespace offline_pages