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 256e6f4573377237d2ba7e9d6a7b5d36c6f33d4e..974663c8e9682cfacd171b069e0420ab8f132a36 100644 |
--- a/chrome/browser/android/download/chrome_download_delegate.cc |
+++ b/chrome/browser/android/download/chrome_download_delegate.cc |
@@ -142,49 +142,11 @@ void ChromeDownloadDelegate::SetJavaRef(JNIEnv* env, jobject jobj) { |
java_ref_ = env->NewGlobalRef(jobj); |
} |
-void ChromeDownloadDelegate::RequestHTTPGetDownload( |
- const std::string& url, |
- const std::string& user_agent, |
- const std::string& content_disposition, |
- const std::string& mime_type, |
- const std::string& cookie, |
- const std::string& referer, |
- const base::string16& file_name, |
- int64_t content_length, |
- bool has_user_gesture, |
- bool must_download) { |
- JNIEnv* env = base::android::AttachCurrentThread(); |
- ScopedJavaLocalRef<jstring> jurl = |
- ConvertUTF8ToJavaString(env, url); |
- ScopedJavaLocalRef<jstring> juser_agent = |
- ConvertUTF8ToJavaString(env, user_agent); |
- ScopedJavaLocalRef<jstring> jcontent_disposition = |
- ConvertUTF8ToJavaString(env, content_disposition); |
- ScopedJavaLocalRef<jstring> jmime_type = |
- ConvertUTF8ToJavaString(env, mime_type); |
- ScopedJavaLocalRef<jstring> jcookie = |
- ConvertUTF8ToJavaString(env, cookie); |
- ScopedJavaLocalRef<jstring> jreferer = |
- ConvertUTF8ToJavaString(env, referer); |
- |
- // net::GetSuggestedFilename will fallback to "download" as filename. |
- ScopedJavaLocalRef<jstring> jfilename = |
- base::android::ConvertUTF16ToJavaString(env, file_name); |
- Java_ChromeDownloadDelegate_requestHttpGetDownload( |
- env, java_ref_, jurl, juser_agent, jcontent_disposition, jmime_type, |
- jcookie, jreferer, has_user_gesture, jfilename, content_length, |
- must_download); |
-} |
- |
-void ChromeDownloadDelegate::OnDownloadStarted(const std::string& filename, |
- const std::string& mime_type) { |
+void ChromeDownloadDelegate::OnDownloadStarted(const std::string& filename) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString( |
env, filename); |
- ScopedJavaLocalRef<jstring> jmime_type = |
- ConvertUTF8ToJavaString(env, mime_type); |
- Java_ChromeDownloadDelegate_onDownloadStarted(env, java_ref_, jfilename, |
- jmime_type); |
+ Java_ChromeDownloadDelegate_onDownloadStarted(env, java_ref_, jfilename); |
} |
void ChromeDownloadDelegate::OnDangerousDownload(const std::string& filename, |