PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rebase to 145: fix build errors

Browse Source
This commit is contained in:
Carmelo Messina
2026-02-06 13:45:58 +01:00
parent 876b263515
commit 2d042e369b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/eyeo-133.0.6943.49-android_api.patch
+8 -7
View File
@@ -44,9 +44,9 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module
.../TestPagesWildcardDomainTestBase.java | 116 ++++
.../TestResourceFilteringObserver.java | 180 ++++++
.../adblock/TestVerificationUtils.java | 220 +++++++
...esource_classification_notifier_android.cc | 165 ++++++
...esource_classification_notifier_android.cc | 166 ++++++
...resource_classification_notifier_android.h | 72 +++
40 files changed, 5615 insertions(+)
40 files changed, 5616 insertions(+)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/adblock/TabIdTranslator.java
create mode 100644 chrome/browser/android/adblock/tab_id_translator_jni.cc
create mode 100644 components/adblock/android/BUILD.gn
@@ -5711,7 +5711,7 @@ diff --git a/components/adblock/android/resource_classification_notifier_android
new file mode 100644
--- /dev/null
+++ b/components/adblock/android/resource_classification_notifier_android.cc
@@ -0,0 +1,165 @@
@@ -0,0 +1,166 @@
+/*
+ * This file is part of eyeo Chromium SDK,
+ * Copyright (C) 2006-present eyeo GmbH
@@ -5735,13 +5735,14 @@ new file mode 100644
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/android/jni_weak_ref.h"
+#include "components/adblock/android/jni_headers/ResourceClassificationNotifier_jni.h"
+#include "components/adblock/content/browser/factories/resource_classification_runner_factory.h"
+#include "components/adblock/core/common/adblock_utils.h"
+#include "content/public/browser/android/browser_context_handle.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
+
+#include "components/adblock/android/jni_headers/ResourceClassificationNotifier_jni.h"
+
+using base::android::AttachCurrentThread;
+using base::android::ConvertUTF8ToJavaString;
+using base::android::JavaRef;
@@ -5798,7 +5799,7 @@ new file mode 100644
+ render_frame_host->GetGlobalId();
+ Java_ResourceClassificationNotifier_requestMatchedCallback(
+ env, java_controller, j_url, was_blocked, j_parents, j_subscription,
+ j_configuration, static_cast<int>(content_type), rfh_id.child_id,
+ j_configuration, static_cast<int>(content_type), rfh_id.child_id.GetUnsafeValue(),
+ rfh_id.frame_routing_id);
+ }
+}
@@ -5824,7 +5825,7 @@ new file mode 100644
+ render_frame_host->GetGlobalId();
+ Java_ResourceClassificationNotifier_pageAllowedCallback(
+ env, java_controller, j_url, j_subscription, j_configuration,
+ rfh_id.child_id, rfh_id.frame_routing_id);
+ rfh_id.child_id.GetUnsafeValue(), rfh_id.frame_routing_id);
+ }
+}
+
@@ -5857,7 +5858,7 @@ new file mode 100644
+ render_frame_host->GetGlobalId();
+ Java_ResourceClassificationNotifier_popupMatchedCallback(
+ env, java_controller, j_url, was_blocked, j_opener, j_subscription,
+ j_configuration, rfh_id.child_id, rfh_id.frame_routing_id);
+ j_configuration, rfh_id.child_id.GetUnsafeValue(), rfh_id.frame_routing_id);
+ }
+}
+