OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/android/offline_pages/downloads/offline_page_download_b ridge.h" | 5 #include "chrome/browser/android/offline_pages/downloads/offline_page_download_b ridge.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 24 matching lines...) Expand all Loading... | |
35 #include "url/gurl.h" | 35 #include "url/gurl.h" |
36 | 36 |
37 using base::android::AttachCurrentThread; | 37 using base::android::AttachCurrentThread; |
38 using base::android::ConvertJavaStringToUTF8; | 38 using base::android::ConvertJavaStringToUTF8; |
39 using base::android::ConvertUTF8ToJavaString; | 39 using base::android::ConvertUTF8ToJavaString; |
40 using base::android::ConvertUTF16ToJavaString; | 40 using base::android::ConvertUTF16ToJavaString; |
41 using base::android::JavaParamRef; | 41 using base::android::JavaParamRef; |
42 using base::android::ScopedJavaGlobalRef; | 42 using base::android::ScopedJavaGlobalRef; |
43 using base::android::ScopedJavaLocalRef; | 43 using base::android::ScopedJavaLocalRef; |
44 | 44 |
45 namespace { | |
46 const char kDownloadUIAdapterKey[] = "download-ui-adapter"; | |
47 } | |
48 | |
45 namespace offline_pages { | 49 namespace offline_pages { |
46 namespace android { | 50 namespace android { |
47 | 51 |
48 namespace { | 52 namespace { |
49 | 53 |
54 class DownloadUIAdapterDelegate : public DownloadUIAdapter::Delegate { | |
55 public: | |
56 explicit DownloadUIAdapterDelegate(OfflinePageModel* model); | |
57 | |
58 // DownloadUIAdapter::Delegate | |
59 bool IsVisibleInUI(const ClientId& client_id) override; | |
60 bool IsTemporaryHiddenInUI(const ClientId& client_id) override; | |
61 | |
62 private: | |
63 // Not owned, cached service pointer. | |
64 OfflinePageModel* model_; | |
65 }; | |
66 | |
67 DownloadUIAdapterDelegate::DownloadUIAdapterDelegate(OfflinePageModel* model) | |
68 : model_(model) {} | |
69 | |
70 bool DownloadUIAdapterDelegate::IsVisibleInUI(const ClientId& client_id) { | |
71 const std::string& name_space = client_id.name_space; | |
72 return model_->GetPolicyController()->IsSupportedByDownload(name_space) && | |
73 base::IsValidGUID(client_id.id); | |
74 } | |
75 | |
76 bool DownloadUIAdapterDelegate::IsTemporaryHiddenInUI( | |
77 const ClientId& client_id) { | |
78 return false; | |
79 } | |
80 | |
50 // TODO(dewittj): Move to Download UI Adapter. | 81 // TODO(dewittj): Move to Download UI Adapter. |
51 content::WebContents* GetWebContentsFromJavaTab( | 82 content::WebContents* GetWebContentsFromJavaTab( |
52 const ScopedJavaGlobalRef<jobject>& j_tab_ref) { | 83 const ScopedJavaGlobalRef<jobject>& j_tab_ref) { |
53 JNIEnv* env = AttachCurrentThread(); | 84 JNIEnv* env = AttachCurrentThread(); |
54 TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab_ref); | 85 TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab_ref); |
55 if (!tab) | 86 if (!tab) |
56 return nullptr; | 87 return nullptr; |
57 | 88 |
58 return tab->web_contents(); | 89 return tab->web_contents(); |
59 } | 90 } |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
178 base::Bind(&RequestQueueDuplicateCheckDone, original_url, j_tab_ref)); | 209 base::Bind(&RequestQueueDuplicateCheckDone, original_url, j_tab_ref)); |
179 } | 210 } |
180 | 211 |
181 void ToJavaOfflinePageDownloadItemList( | 212 void ToJavaOfflinePageDownloadItemList( |
182 JNIEnv* env, | 213 JNIEnv* env, |
183 jobject j_result_obj, | 214 jobject j_result_obj, |
184 const std::vector<const DownloadUIItem*>& items) { | 215 const std::vector<const DownloadUIItem*>& items) { |
185 for (const auto item : items) { | 216 for (const auto item : items) { |
186 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList( | 217 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList( |
187 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid), | 218 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid), |
188 ConvertUTF8ToJavaString(env, item->url.spec()), | 219 ConvertUTF8ToJavaString(env, item->url.spec()), item->download_state, |
220 item->download_progress.current, item->download_progress.max, | |
dewittj
2017/02/03 22:05:40
hm, this doesn't seem to match DownloadUIItem
Dmitry Titov
2017/02/08 00:45:08
Done.
| |
189 ConvertUTF16ToJavaString(env, item->title), | 221 ConvertUTF16ToJavaString(env, item->title), |
190 ConvertUTF8ToJavaString(env, item->target_path.value()), | 222 ConvertUTF8ToJavaString(env, item->target_path.value()), |
191 item->start_time.ToJavaTime(), item->total_bytes); | 223 item->start_time.ToJavaTime(), item->total_bytes); |
192 } | 224 } |
193 } | 225 } |
194 | 226 |
195 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem( | 227 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem( |
196 JNIEnv* env, | 228 JNIEnv* env, |
197 const DownloadUIItem& item) { | 229 const DownloadUIItem& item) { |
198 return Java_OfflinePageDownloadBridge_createDownloadItem( | 230 return Java_OfflinePageDownloadBridge_createDownloadItem( |
199 env, ConvertUTF8ToJavaString(env, item.guid), | 231 env, ConvertUTF8ToJavaString(env, item.guid), |
200 ConvertUTF8ToJavaString(env, item.url.spec()), | 232 ConvertUTF8ToJavaString(env, item.url.spec()), item.download_state, |
233 item.download_progress.current, item.download_progress.max, | |
201 ConvertUTF16ToJavaString(env, item.title), | 234 ConvertUTF16ToJavaString(env, item.title), |
202 ConvertUTF8ToJavaString(env, item.target_path.value()), | 235 ConvertUTF8ToJavaString(env, item.target_path.value()), |
203 item.start_time.ToJavaTime(), item.total_bytes); | 236 item.start_time.ToJavaTime(), item.total_bytes); |
204 } | 237 } |
205 | 238 |
206 std::vector<int64_t> FilterRequestsByGuid( | 239 std::vector<int64_t> FilterRequestsByGuid( |
207 std::vector<std::unique_ptr<SavePageRequest>> requests, | 240 std::vector<std::unique_ptr<SavePageRequest>> requests, |
208 const std::string& guid, | 241 const std::string& guid, |
209 ClientPolicyController* policy_controller) { | 242 ClientPolicyController* policy_controller) { |
210 std::vector<int64_t> request_ids; | 243 std::vector<int64_t> request_ids; |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
433 env, obj, ToJavaOfflinePageDownloadItem(env, item)); | 466 env, obj, ToJavaOfflinePageDownloadItem(env, item)); |
434 } | 467 } |
435 | 468 |
436 static jlong Init(JNIEnv* env, | 469 static jlong Init(JNIEnv* env, |
437 const JavaParamRef<jobject>& obj, | 470 const JavaParamRef<jobject>& obj, |
438 const JavaParamRef<jobject>& j_profile) { | 471 const JavaParamRef<jobject>& j_profile) { |
439 content::BrowserContext* browser_context = | 472 content::BrowserContext* browser_context = |
440 ProfileAndroid::FromProfileAndroid(j_profile); | 473 ProfileAndroid::FromProfileAndroid(j_profile); |
441 | 474 |
442 OfflinePageModel* offline_page_model = | 475 OfflinePageModel* offline_page_model = |
443 OfflinePageModelFactory::GetForBrowserContext(browser_context); | 476 OfflinePageModelFactory::GetForBrowserContext(browser_context); |
dewittj
2017/01/30 20:59:34
do we need to |nullptr|-check here
Dmitry Titov
2017/02/08 00:45:08
Not sure what would be a great action here if ther
| |
444 | 477 |
445 DownloadUIAdapter* adapter = | 478 DownloadUIAdapter* adapter = static_cast<DownloadUIAdapter*>( |
446 DownloadUIAdapter::FromOfflinePageModel(offline_page_model); | 479 offline_page_model->GetUserData(kDownloadUIAdapterKey)); |
480 | |
481 if (!adapter) { | |
482 RequestCoordinator* request_coordinator = | |
483 RequestCoordinatorFactory::GetForBrowserContext(browser_context); | |
dewittj
2017/01/30 20:59:34
also do we need to nullptr-check here
Dmitry Titov
2017/02/08 00:45:08
Ditto as above.
| |
484 adapter = new DownloadUIAdapter( | |
485 offline_page_model, request_coordinator, | |
486 base::MakeUnique<DownloadUIAdapterDelegate>(offline_page_model)); | |
487 offline_page_model->SetUserData(kDownloadUIAdapterKey, adapter); | |
488 } | |
447 | 489 |
448 return reinterpret_cast<jlong>( | 490 return reinterpret_cast<jlong>( |
449 new OfflinePageDownloadBridge(env, obj, adapter, browser_context)); | 491 new OfflinePageDownloadBridge(env, obj, adapter, browser_context)); |
450 } | 492 } |
451 | 493 |
452 } // namespace android | 494 } // namespace android |
453 } // namespace offline_pages | 495 } // namespace offline_pages |
OLD | NEW |