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

Unified Diff: chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc

Issue 2221293002: Implement deleteItem and openItem on OfflinePageDownloadBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more updates Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc
diff --git a/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc b/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc
index 4ae4a7e73868987b8b638174ce16edef68be4799..585aa8edece699f2d5a758c9838a6b901600bb2b 100644
--- a/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc
+++ b/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.cc
@@ -14,6 +14,7 @@
#include "components/offline_pages/offline_page_model.h"
#include "jni/OfflinePageDownloadBridge_jni.h"
#include "net/base/filename_util.h"
+#include "url/gurl.h"
using base::android::AttachCurrentThread;
using base::android::ConvertJavaStringToUTF8;
@@ -27,16 +28,16 @@ namespace android {
namespace {
-void ToJavaOfflinePageDownloadItemList(JNIEnv* env,
- jobject j_result_obj,
- const DownloadUIItemsMap& items_map) {
- for (const auto& guid_item_pair : items_map) {
- const DownloadUIItem& item = *(guid_item_pair.second.get());
+void ToJavaOfflinePageDownloadItemList(
+ JNIEnv* env,
+ jobject j_result_obj,
+ const std::vector<const DownloadUIItem*>& items) {
+ for (const auto item : items) {
Java_OfflinePageDownloadBridge_createDownloadItemAndAddToList(
- env, j_result_obj, ConvertUTF8ToJavaString(env, item.guid).obj(),
- ConvertUTF8ToJavaString(env, item.url.spec()).obj(),
- ConvertUTF8ToJavaString(env, item.target_path.value()).obj(),
- item.start_time.ToJavaTime(), item.total_bytes);
+ env, j_result_obj, ConvertUTF8ToJavaString(env, item->guid).obj(),
+ ConvertUTF8ToJavaString(env, item->url.spec()).obj(),
+ ConvertUTF8ToJavaString(env, item->target_path.value()).obj(),
+ item->start_time.ToJavaTime(), item->total_bytes);
}
}
@@ -80,19 +81,39 @@ void OfflinePageDownloadBridge::GetAllItems(
const JavaParamRef<jobject>& j_result_obj) {
DCHECK(j_result_obj);
- const DownloadUIItemsMap& items_map = download_ui_adapter_->GetAllItems();
- ToJavaOfflinePageDownloadItemList(env, j_result_obj, items_map);
+ std::vector<const DownloadUIItem*> items =
+ download_ui_adapter_->GetAllItems();
+ ToJavaOfflinePageDownloadItemList(env, j_result_obj, items);
}
ScopedJavaLocalRef<jobject> OfflinePageDownloadBridge::GetItemByGuid(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
- const base::android::JavaParamRef<jstring>& j_guid) {
+ const JavaParamRef<jstring>& j_guid) {
std::string guid = ConvertJavaStringToUTF8(env, j_guid);
const DownloadUIItem* item = download_ui_adapter_->GetItem(guid);
return ToJavaOfflinePageDownloadItem(env, *item);
}
+void OfflinePageDownloadBridge::DeleteItemByGuid(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj,
+ const JavaParamRef<jstring>& j_guid) {
+ std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+ download_ui_adapter_->DeleteItem(guid);
+}
+
+ScopedJavaLocalRef<jstring> OfflinePageDownloadBridge::GetOfflineUrlByGuid(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& obj,
+ const JavaParamRef<jstring>& j_guid) {
+ std::string guid = ConvertJavaStringToUTF8(env, j_guid);
+ GURL url = download_ui_adapter_->GetOfflineUrlByGuid(guid);
+ if (!url.is_valid())
+ return ScopedJavaLocalRef<jstring>();
+ return ConvertUTF8ToJavaString(env, url.spec());
+}
+
void OfflinePageDownloadBridge::ItemsLoaded() {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);

Powered by Google App Engine
This is Rietveld 408576698