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

[AUTO] Patches auto-rebase

Browse Source
This commit is contained in:
uazo
2024-07-17 08:22:13 +00:00
committed by github-actions[bot]
parent a4134b9853
commit 883501470f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Disable-feeds-support-by-default.patch
+3 -2
View File
@@ -161,14 +161,15 @@ diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/c
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
@@ -151,9 +151,12 @@ BASE_FEATURE(kFeedContainment,
@@ -155,10 +155,13 @@ BASE_FEATURE(kWebFeedKillSwitch,
base::FEATURE_DISABLED_BY_DEFAULT);
bool IsWebFeedEnabledForLocale(const std::string& country) {
+ if ((true)) return false;
const std::vector<std::string> launched_countries = {"AU", "CA", "GB",
"NZ", "US", "ZA"};
return base::Contains(launched_countries, country);
return base::Contains(launched_countries, country) &&
!base::FeatureList::IsEnabled(kWebFeedKillSwitch);
}
+SET_CROMITE_FEATURE_DISABLED(kInterestFeedV2);
build/patches/Experimental-user-scripts-support.patch
+1 -1
View File
@@ -10484,7 +10484,7 @@ diff --git a/ipc/ipc_message_start.h b/ipc/ipc_message_start.h
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1012,6 +1012,12 @@
@@ -1015,6 +1015,12 @@
"components/search_engine_descriptions_strings.grd": {
"messages": [7260],
},
build/patches/eyeo-beta-118.0.5993.48-base.patch
+1 -1
View File
@@ -53128,7 +53128,7 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_
# This file is used to assign starting resource ids for resources and strings
# used by Chromium. This is done to ensure that resource ids are unique
# across all the grd files. If you are adding a new grd file, please add
@@ -731,6 +735,10 @@
@@ -734,6 +738,10 @@
"META": {"sizes": {"includes": [10]}},
"includes": [5460],
},
build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
+2 -2
View File
@@ -2187,7 +2187,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
import("//build/config/chromeos/ui_mode.gni")
import("//chrome/browser/buildflags.gni")
@@ -235,6 +238,7 @@ if (!is_android) {
@@ -249,6 +252,7 @@ if (!is_android) {
group("dev_ui_resources") {
public_deps = [
"accessibility:resources",
@@ -2195,7 +2195,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.
"bluetooth_internals:resources",
"browsing_topics:resources",
"components:resources",
@@ -293,6 +297,7 @@ repack("dev_ui_paks") {
@@ -307,6 +311,7 @@ repack("dev_ui_paks") {
sources = [
"$root_gen_dir/chrome/accessibility_resources.pak",