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" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
228 ScopedJavaLocalRef<jstring> jreferer = | 228 ScopedJavaLocalRef<jstring> jreferer = |
229 ConvertUTF8ToJavaString(env, info.referer); | 229 ConvertUTF8ToJavaString(env, info.referer); |
230 | 230 |
231 Java_DownloadController_newHttpGetDownload( | 231 Java_DownloadController_newHttpGetDownload( |
232 env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(), | 232 env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(), |
233 juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(), | 233 juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(), |
234 jcookie.obj(), jreferer.obj(), info.total_bytes); | 234 jcookie.obj(), jreferer.obj(), info.total_bytes); |
235 } | 235 } |
236 | 236 |
237 void DownloadControllerAndroidImpl::OnPostDownloadStarted( | 237 void DownloadControllerAndroidImpl::OnPostDownloadStarted( |
238 WebContents* web_contents, | |
239 DownloadItem* download_item) { | 238 DownloadItem* download_item) { |
240 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 239 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
240 if (download_item->GetWebContents() == NULL) | |
benjhayden
2012/12/20 21:09:14
I thought the convention was if (!GetWebContents()
asanka
2012/12/20 22:41:19
Done.
| |
241 return; | |
242 | |
241 JNIEnv* env = AttachCurrentThread(); | 243 JNIEnv* env = AttachCurrentThread(); |
242 | 244 |
243 // Register for updates to the DownloadItem. | 245 // Register for updates to the DownloadItem. |
244 download_item->AddObserver(this); | 246 download_item->AddObserver(this); |
245 | 247 |
246 ScopedJavaLocalRef<jobject> view = | 248 ScopedJavaLocalRef<jobject> view = |
247 GetContentViewCoreFromWebContents(web_contents); | 249 GetContentViewCoreFromWebContents(download_item->GetWebContents()); |
248 if(view.is_null()) { | 250 if(view.is_null()) { |
249 // The view went away. Can't proceed. | 251 // The view went away. Can't proceed. |
250 return; | 252 return; |
251 } | 253 } |
252 | 254 |
253 Java_DownloadController_onHttpPostDownloadStarted( | 255 Java_DownloadController_onHttpPostDownloadStarted( |
254 env, GetJavaObject()->Controller(env).obj(), view.obj()); | 256 env, GetJavaObject()->Controller(env).obj(), view.obj()); |
255 } | 257 } |
256 | 258 |
257 void DownloadControllerAndroidImpl::OnDownloadUpdated(DownloadItem* item) { | 259 void DownloadControllerAndroidImpl::OnDownloadUpdated(DownloadItem* item) { |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
347 referer = referer_url.spec(); | 349 referer = referer_url.spec(); |
348 if (!request->url_chain().empty()) { | 350 if (!request->url_chain().empty()) { |
349 original_url = request->url_chain().front(); | 351 original_url = request->url_chain().front(); |
350 url = request->url_chain().back(); | 352 url = request->url_chain().back(); |
351 } | 353 } |
352 } | 354 } |
353 | 355 |
354 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {} | 356 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {} |
355 | 357 |
356 } // namespace content | 358 } // namespace content |
OLD | NEW |