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

[AUTO] Patches auto-rebase for next-125 branch (#1103)

Browse Source 
[AUTO] Patches auto-rebase for next-125 branch
This commit is contained in:
uazo
2024-05-15 14:34:05 +01:00
committed by GitHub
parent a622ae4b86 b66c9e67ba
commit 00b3446da5
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Allow-building-without-supervised-users.patch
+3 -3
View File
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -762,7 +762,6 @@ if (current_toolchain == default_toolchain) {
@@ -749,7 +749,6 @@ if (current_toolchain == default_toolchain) {
"//components/dom_distiller/core:distiller_type_java",
"//components/ntp_tiles:ntp_tiles_enums_java",
"//components/offline_pages/core:offline_page_model_enums_java",
@@ -56,7 +56,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3261,8 +3261,6 @@ static_library("browser") {
@@ -3237,8 +3237,6 @@ static_library("browser") {
"feed/android/refresh_task_scheduler_impl.cc",
"feed/android/refresh_task_scheduler_impl.h",
"feed/android/web_feed_bridge.cc",
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -328,7 +328,7 @@ void PrepareFactory(
@@ -317,7 +317,7 @@ void PrepareFactory(
policy::BrowserPolicyConnector* policy_connector) {
factory->SetManagedPolicies(policy_service, policy_connector);
factory->SetRecommendedPolicies(policy_service, policy_connector);
build/patches/Content-settings-infrastructure.patch
+3 -4
View File
@@ -66,7 +66,7 @@ Require: bromite-build-utils.patch
.../core/browser/website_settings_registry.h | 1 +
.../content_settings/core/common/BUILD.gn | 7 +
.../bromite_content_settings/placeholder.txt | 1 +
.../core/common/content_settings.cc | 31 +-
.../core/common/content_settings.cc | 30 +-
.../core/common/content_settings.h | 12 +
.../core/common/content_settings.mojom | 6 +
.../common/content_settings_mojom_traits.cc | 12 +-
@@ -83,7 +83,7 @@ Require: bromite-build-utils.patch
.../platform/web_content_settings_client.h | 9 +
.../execution_context/execution_context.cc | 16 +
.../execution_context/execution_context.h | 5 +
72 files changed, 1866 insertions(+), 95 deletions(-)
72 files changed, 1865 insertions(+), 95 deletions(-)
create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
@@ -2984,7 +2984,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
}
RendererContentSettingRules::RendererContentSettingRules() = default;
@@ -127,4 +138,18 @@ RendererContentSettingRules& RendererContentSettingRules::operator=(
@@ -127,4 +138,17 @@ RendererContentSettingRules& RendererContentSettingRules::operator=(
RendererContentSettingRules&& rules) = default;
bool RendererContentSettingRules::operator==(
@@ -3003,7 +3003,6 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
+
+bool ContentSettingRuleSource::operator==(
+ const ContentSettingRuleSource& other) const = default;
+
diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
build/patches/eyeo-beta-118.0.5993.48-android_api.patch
+5 -5
View File
@@ -105,7 +105,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/autofill/android:autofill_java",
"//components/background_task_scheduler:background_task_scheduler_java",
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
@@ -1645,6 +1650,7 @@ if (current_toolchain == default_toolchain) {
@@ -1644,6 +1649,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/android/webapk/libs/client:client_java",
"//chrome/android/webapk/libs/common:common_java",
"//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
@@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/android/browserservices/intents:java",
"//chrome/browser/android/browserservices/verification:java",
"//chrome/browser/android/browserservices/verification:javatests",
@@ -1998,6 +2004,7 @@ if (current_toolchain == default_toolchain) {
@@ -1997,6 +2003,7 @@ if (current_toolchain == default_toolchain) {
srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ]
data = [
@@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/test/data/android/",
"//chrome/test/data/autofill/",
"//chrome/test/data/background_sync/",
@@ -3851,6 +3858,7 @@ group("jni_headers") {
@@ -3850,6 +3857,7 @@ group("jni_headers") {
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
"//components/browser_ui/device_lock/android:device_lock_bridge_jni_headers",
@@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3522,6 +3522,17 @@ static_library("browser") {
@@ -3520,6 +3520,17 @@ static_library("browser") {
"webauthn/android/webauthn_request_delegate_android.h",
]
@@ -150,7 +150,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
public_deps += [
"//chrome/android/features/dev_ui:buildflags",
@@ -3719,6 +3730,9 @@ static_library("browser") {
@@ -3717,6 +3728,9 @@ static_library("browser") {
"//url",
]
build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
+2 -2
View File
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/assist_ranker",
"//components/autofill/content/browser",
"//components/autofill/content/common:features",
@@ -3495,6 +3521,8 @@ static_library("browser") {
@@ -3493,6 +3519,8 @@ static_library("browser") {
"webauthn/android/webauthn_request_delegate_android.cc",
"webauthn/android/webauthn_request_delegate_android.h",
]
@@ -185,7 +185,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
public_deps += [
"//chrome/android/features/dev_ui:buildflags",
"//components/image_fetcher/core",
@@ -3691,6 +3719,7 @@ static_library("browser") {
@@ -3689,6 +3717,7 @@ static_library("browser") {
"//url",
]