| Index: chrome/browser/android/download/chrome_download_delegate.cc
|
| diff --git a/chrome/browser/android/download/chrome_download_delegate.cc b/chrome/browser/android/download/chrome_download_delegate.cc
|
| index 10afa8ecbfe95fc4fc616a45a1d79c19c0e035c8..dc75a1826f12b46d0af34fc56aca94523d5554c0 100644
|
| --- a/chrome/browser/android/download/chrome_download_delegate.cc
|
| +++ b/chrome/browser/android/download/chrome_download_delegate.cc
|
| @@ -19,9 +19,7 @@
|
| #include "chrome/browser/android/download/download_controller_base.h"
|
| #include "chrome/browser/android/tab_android.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| -#include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
|
| #include "chrome/common/safe_browsing/file_type_policies.h"
|
| -#include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "jni/ChromeDownloadDelegate_jni.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -73,36 +71,6 @@ static void LaunchDuplicateDownloadInfoBar(
|
| delegate, download_info, is_incognito);
|
| }
|
|
|
| -static void LaunchPermissionUpdateInfoBar(
|
| - JNIEnv* env,
|
| - const JavaParamRef<jclass>& clazz,
|
| - const JavaParamRef<jobject>& tab,
|
| - const JavaParamRef<jstring>& jpermission,
|
| - jlong callback_id) {
|
| - TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab);
|
| -
|
| - std::string permission =
|
| - base::android::ConvertJavaStringToUTF8(env, jpermission);
|
| -
|
| - // Convert java long long int to c++ pointer, take ownership.
|
| - static_assert(
|
| - std::is_same<
|
| - DownloadControllerBase::AcquireFileAccessPermissionCallback,
|
| - base::Callback<void(bool)>>::value,
|
| - "Callback types don't match!");
|
| - std::unique_ptr<base::Callback<void(bool)>> cb(
|
| - reinterpret_cast<base::Callback<void(bool)>*>(callback_id));
|
| -
|
| - std::vector<std::string> permissions;
|
| - permissions.push_back(permission);
|
| -
|
| - PermissionUpdateInfoBarDelegate::Create(
|
| - tab_android->web_contents(),
|
| - permissions,
|
| - IDS_MISSING_STORAGE_PERMISSION_DOWNLOAD_EDUCATION_TEXT,
|
| - *cb);
|
| -}
|
| -
|
| ChromeDownloadDelegate::ChromeDownloadDelegate(
|
| WebContents* web_contents) {}
|
|
|
| @@ -122,12 +90,6 @@ void ChromeDownloadDelegate::OnDownloadStarted(const std::string& filename) {
|
| Java_ChromeDownloadDelegate_onDownloadStarted(env, java_ref_, jfilename);
|
| }
|
|
|
| -void ChromeDownloadDelegate::RequestFileAccess(intptr_t callback_id) {
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - Java_ChromeDownloadDelegate_requestFileAccess(
|
| - env, java_ref_, callback_id);
|
| -}
|
| -
|
| void ChromeDownloadDelegate::EnqueueDownloadManagerRequest(
|
| const std::string& url,
|
| const std::string& user_agent,
|
|
|