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

Unified Diff: chrome/browser/android/offline_pages/offline_page_bridge.cc

Issue 2373933003: [Offline pages] Updating RequestQueue::RemoveRequests to use a TaskQueue (Closed)
Patch Set: Addressing final feedback Created 4 years, 2 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/offline_page_bridge.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.cc b/chrome/browser/android/offline_pages/offline_page_bridge.cc
index 4c22d71c5e105189b53c408190e1dafc5ae66774..cdf23e23c289facef69cecde8a6241f80fddfa7e 100644
--- a/chrome/browser/android/offline_pages/offline_page_bridge.cc
+++ b/chrome/browser/android/offline_pages/offline_page_bridge.cc
@@ -169,19 +169,34 @@ void OnGetAllRequestsDone(
base::android::RunCallbackAndroid(j_callback_obj, j_result_obj);
}
-void OnRemoveRequestsDone(
- const ScopedJavaGlobalRef<jobject>& j_callback_obj,
- const RequestQueue::UpdateMultipleRequestResults& removed_request_results) {
+RequestQueue::UpdateRequestResult ToUpdateRequestResult(
+ ItemActionStatus status) {
+ switch (status) {
+ case ItemActionStatus::SUCCESS:
+ return RequestQueue::UpdateRequestResult::SUCCESS;
+ case ItemActionStatus::NOT_FOUND:
+ return RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
+ case ItemActionStatus::STORE_ERROR:
+ return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+ case ItemActionStatus::ALREADY_EXISTS:
+ default:
+ NOTREACHED();
+ }
+ return RequestQueue::UpdateRequestResult::STORE_FAILURE;
+}
+
+void OnRemoveRequestsDone(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
+ const MultipleItemStatuses& removed_request_results) {
JNIEnv* env = base::android::AttachCurrentThread();
std::vector<int> update_request_results;
std::vector<int64_t> update_request_ids;
- for (std::pair<int64_t, RequestQueue::UpdateRequestResult> remove_result :
+ for (std::pair<int64_t, ItemActionStatus> remove_result :
removed_request_results) {
update_request_ids.emplace_back(std::get<0>(remove_result));
update_request_results.emplace_back(
- static_cast<int>(std::get<1>(remove_result)));
+ static_cast<int>(ToUpdateRequestResult(std::get<1>(remove_result))));
}
ScopedJavaLocalRef<jlongArray> j_result_ids =

Powered by Google App Engine
This is Rietveld 408576698