Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc

Issue 2631933002: Adding status info to DownloadUIItem and piping it through. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
61 private:
62 // Not owned, cached service pointer.
63 OfflinePageModel* model_;
64 };
65
66 DownloadUIAdapterDelegate::DownloadUIAdapterDelegate(OfflinePageModel *model)
67 : model_(model) {
68 }
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
50 // TODO(dewittj): Move to Download UI Adapter. 76 // TODO(dewittj): Move to Download UI Adapter.
51 content::WebContents* GetWebContentsFromJavaTab( 77 content::WebContents* GetWebContentsFromJavaTab(
52 const ScopedJavaGlobalRef<jobject>& j_tab_ref) { 78 const ScopedJavaGlobalRef<jobject>& j_tab_ref) {
53 JNIEnv* env = AttachCurrentThread(); 79 JNIEnv* env = AttachCurrentThread();
54 TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab_ref); 80 TabAndroid* tab = TabAndroid::GetNativeTab(env, j_tab_ref);
55 if (!tab) 81 if (!tab)
56 return nullptr; 82 return nullptr;
57 83
58 return tab->web_contents(); 84 return tab->web_contents();
59 } 85 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 205 }
180 206
181 void ToJavaOfflinePageDownloadItemList( 207 void ToJavaOfflinePageDownloadItemList(
182 JNIEnv* env, 208 JNIEnv* env,
183 jobject j_result_obj, 209 jobject j_result_obj,
184 const std::vector<const DownloadUIItem*>& items) { 210 const std::vector<const DownloadUIItem*>& items) {
185 for (const auto item : items) { 211 for (const auto item : items) {
186 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList( 212 Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList(
187 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid), 213 env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid),
188 ConvertUTF8ToJavaString(env, item->url.spec()), 214 ConvertUTF8ToJavaString(env, item->url.spec()),
215 item->download_state,
216 item->download_progress.current,
217 item->download_progress.max,
189 ConvertUTF16ToJavaString(env, item->title), 218 ConvertUTF16ToJavaString(env, item->title),
190 ConvertUTF8ToJavaString(env, item->target_path.value()), 219 ConvertUTF8ToJavaString(env, item->target_path.value()),
191 item->start_time.ToJavaTime(), item->total_bytes); 220 item->start_time.ToJavaTime(), item->total_bytes);
192 } 221 }
193 } 222 }
194 223
195 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem( 224 ScopedJavaLocalRef<jobject> ToJavaOfflinePageDownloadItem(
196 JNIEnv* env, 225 JNIEnv* env,
197 const DownloadUIItem& item) { 226 const DownloadUIItem& item) {
198 return Java_OfflinePageDownloadBridge_createDownloadItem( 227 return Java_OfflinePageDownloadBridge_createDownloadItem(
199 env, ConvertUTF8ToJavaString(env, item.guid), 228 env, ConvertUTF8ToJavaString(env, item.guid),
200 ConvertUTF8ToJavaString(env, item.url.spec()), 229 ConvertUTF8ToJavaString(env, item.url.spec()),
230 item.download_state,
231 item.download_progress.current,
232 item.download_progress.max,
201 ConvertUTF16ToJavaString(env, item.title), 233 ConvertUTF16ToJavaString(env, item.title),
202 ConvertUTF8ToJavaString(env, item.target_path.value()), 234 ConvertUTF8ToJavaString(env, item.target_path.value()),
203 item.start_time.ToJavaTime(), item.total_bytes); 235 item.start_time.ToJavaTime(), item.total_bytes);
204 } 236 }
205 237
206 std::vector<int64_t> FilterRequestsByGuid( 238 std::vector<int64_t> FilterRequestsByGuid(
207 std::vector<std::unique_ptr<SavePageRequest>> requests, 239 std::vector<std::unique_ptr<SavePageRequest>> requests,
208 const std::string& guid, 240 const std::string& guid,
209 ClientPolicyController* policy_controller) { 241 ClientPolicyController* policy_controller) {
210 std::vector<int64_t> request_ids; 242 std::vector<int64_t> request_ids;
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 467
436 static jlong Init(JNIEnv* env, 468 static jlong Init(JNIEnv* env,
437 const JavaParamRef<jobject>& obj, 469 const JavaParamRef<jobject>& obj,
438 const JavaParamRef<jobject>& j_profile) { 470 const JavaParamRef<jobject>& j_profile) {
439 content::BrowserContext* browser_context = 471 content::BrowserContext* browser_context =
440 ProfileAndroid::FromProfileAndroid(j_profile); 472 ProfileAndroid::FromProfileAndroid(j_profile);
441 473
442 OfflinePageModel* offline_page_model = 474 OfflinePageModel* offline_page_model =
443 OfflinePageModelFactory::GetForBrowserContext(browser_context); 475 OfflinePageModelFactory::GetForBrowserContext(browser_context);
444 476
445 DownloadUIAdapter* adapter = 477 DownloadUIAdapter* adapter = static_cast<DownloadUIAdapter*>(
446 DownloadUIAdapter::FromOfflinePageModel(offline_page_model); 478 offline_page_model->GetUserData(kDownloadUIAdapterKey));
479
480 if (!adapter) {
481 RequestCoordinator* request_coordinator =
482 RequestCoordinatorFactory::GetForBrowserContext(browser_context);
483 adapter = new DownloadUIAdapter(
484 offline_page_model, request_coordinator,
485 base::MakeUnique<DownloadUIAdapterDelegate>(offline_page_model));
486 offline_page_model->SetUserData(kDownloadUIAdapterKey, adapter);
487 }
447 488
448 return reinterpret_cast<jlong>( 489 return reinterpret_cast<jlong>(
449 new OfflinePageDownloadBridge(env, obj, adapter, browser_context)); 490 new OfflinePageDownloadBridge(env, obj, adapter, browser_context));
450 } 491 }
451 492
452 } // namespace android 493 } // namespace android
453 } // namespace offline_pages 494 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698