OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/android/download_controller_android_impl.h" | 5 #include "content/browser/android/download_controller_android_impl.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
13 #include "content/browser/android/content_view_core_impl.h" | 13 #include "content/browser/android/content_view_core_impl.h" |
14 #include "content/browser/download/download_item_impl.h" | 14 #include "content/browser/download/download_item_impl.h" |
15 #include "content/browser/download/download_manager_impl.h" | 15 #include "content/browser/download/download_manager_impl.h" |
16 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 16 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
17 #include "content/browser/renderer_host/render_process_host_impl.h" | 17 #include "content/browser/renderer_host/render_process_host_impl.h" |
18 #include "content/browser/renderer_host/render_view_host_delegate.h" | 18 #include "content/browser/renderer_host/render_view_host_delegate.h" |
19 #include "content/browser/renderer_host/render_view_host_impl.h" | 19 #include "content/browser/renderer_host/render_view_host_impl.h" |
20 #include "content/browser/web_contents/web_contents_impl.h" | 20 #include "content/browser/web_contents/web_contents_impl.h" |
21 #include "content/public/browser/browser_context.h" | 21 #include "content/public/browser/browser_context.h" |
22 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
23 #include "content/public/browser/download_url_parameters.h" | 23 #include "content/public/browser/download_url_parameters.h" |
24 #include "content/public/browser/global_request_id.h" | 24 #include "content/public/browser/global_request_id.h" |
25 #include "content/public/browser/web_contents_view.h" | 25 #include "content/public/browser/web_contents_view.h" |
26 #include "content/public/common/referrer.h" | 26 #include "content/public/common/referrer.h" |
27 #include "jni/DownloadController_jni.h" | 27 #include "jni/DownloadController_jni.h" |
28 #include "net/cookies/cookie_options.h" | 28 #include "net/cookies/cookie_options.h" |
29 #include "net/cookies/cookie_store.h" | 29 #include "net/cookies/cookie_store.h" |
| 30 #include "net/http/http_content_disposition.h" |
30 #include "net/http/http_request_headers.h" | 31 #include "net/http/http_request_headers.h" |
31 #include "net/http/http_response_headers.h" | 32 #include "net/http/http_response_headers.h" |
32 #include "net/url_request/url_request.h" | 33 #include "net/url_request/url_request.h" |
33 #include "net/url_request/url_request_context.h" | 34 #include "net/url_request/url_request_context.h" |
34 | 35 |
35 using base::android::ConvertUTF8ToJavaString; | 36 using base::android::ConvertUTF8ToJavaString; |
36 using base::android::ScopedJavaLocalRef; | 37 using base::android::ScopedJavaLocalRef; |
37 | 38 |
38 namespace content { | 39 namespace content { |
39 | 40 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 ConvertUTF8ToJavaString(env, info.user_agent); | 215 ConvertUTF8ToJavaString(env, info.user_agent); |
215 ScopedJavaLocalRef<jstring> jcontent_disposition = | 216 ScopedJavaLocalRef<jstring> jcontent_disposition = |
216 ConvertUTF8ToJavaString(env, info.content_disposition); | 217 ConvertUTF8ToJavaString(env, info.content_disposition); |
217 ScopedJavaLocalRef<jstring> jmime_type = | 218 ScopedJavaLocalRef<jstring> jmime_type = |
218 ConvertUTF8ToJavaString(env, info.original_mime_type); | 219 ConvertUTF8ToJavaString(env, info.original_mime_type); |
219 ScopedJavaLocalRef<jstring> jcookie = | 220 ScopedJavaLocalRef<jstring> jcookie = |
220 ConvertUTF8ToJavaString(env, info.cookie); | 221 ConvertUTF8ToJavaString(env, info.cookie); |
221 ScopedJavaLocalRef<jstring> jreferer = | 222 ScopedJavaLocalRef<jstring> jreferer = |
222 ConvertUTF8ToJavaString(env, info.referer); | 223 ConvertUTF8ToJavaString(env, info.referer); |
223 | 224 |
| 225 // Try parsing the content disposition header to get a |
| 226 // explicitly specified filename if available. |
| 227 net::HttpContentDisposition header(info.content_disposition, ""); |
| 228 ScopedJavaLocalRef<jstring> jfilename = |
| 229 ConvertUTF8ToJavaString(env, header.filename()); |
| 230 |
224 Java_DownloadController_newHttpGetDownload( | 231 Java_DownloadController_newHttpGetDownload( |
225 env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(), | 232 env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(), |
226 juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(), | 233 juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(), |
227 jcookie.obj(), jreferer.obj(), info.total_bytes); | 234 jcookie.obj(), jreferer.obj(), jfilename.obj(), info.total_bytes); |
228 } | 235 } |
229 | 236 |
230 void DownloadControllerAndroidImpl::OnDownloadStarted( | 237 void DownloadControllerAndroidImpl::OnDownloadStarted( |
231 DownloadItem* download_item) { | 238 DownloadItem* download_item) { |
232 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 239 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
233 if (!download_item->GetWebContents()) | 240 if (!download_item->GetWebContents()) |
234 return; | 241 return; |
235 | 242 |
236 JNIEnv* env = base::android::AttachCurrentThread(); | 243 JNIEnv* env = base::android::AttachCurrentThread(); |
237 | 244 |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 referer = referer_url.spec(); | 415 referer = referer_url.spec(); |
409 if (!request->url_chain().empty()) { | 416 if (!request->url_chain().empty()) { |
410 original_url = request->url_chain().front(); | 417 original_url = request->url_chain().front(); |
411 url = request->url_chain().back(); | 418 url = request->url_chain().back(); |
412 } | 419 } |
413 } | 420 } |
414 | 421 |
415 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {} | 422 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {} |
416 | 423 |
417 } // namespace content | 424 } // namespace content |
OLD | NEW |