Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9640d418 authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO] Patches auto-rebase

parent 68090602

build/patches/Add-a-flag-to-disable-GamePad-API.patch

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -8685,9 +8685,9 @@

@@ -8690,9 +8690,9 @@

     "expiry_milestone": 150

   },

   {

build/patches/Add-cromite-flags-support.patch

+4 −4
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting 
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -380,6 +380,10 @@ using flags_ui::kOsLinux;

@@ -381,6 +381,10 @@ using flags_ui::kOsLinux;

 using flags_ui::kOsMac;

 using flags_ui::kOsWin;
@@ -653,7 +653,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 namespace about_flags {

 

 namespace {

@@ -4902,6 +4906,10 @@ const FeatureEntry::FeatureVariation

@@ -4903,6 +4907,10 @@ const FeatureEntry::FeatureVariation

 constexpr char kWebiumFlag[] = "webium";

 #endif  // !BUILDFLAG(IS_ANDROID)
@@ -664,7 +664,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -4928,6 +4936,9 @@ constexpr char kWebiumFlag[] = "webium";

@@ -4929,6 +4937,9 @@ constexpr char kWebiumFlag[] = "webium";

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.
@@ -746,7 +746,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -331,6 +331,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

@@ -337,6 +337,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

     "snippet_as_subtitle",

     /*default_value=*/false);

build/patches/Add-site-engagement-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -165,6 +165,7 @@

@@ -166,6 +166,7 @@

 #include "components/sensitive_content/features.h"

 #include "components/services/heap_profiling/public/cpp/switches.h"

 #include "components/services/storage/public/cpp/buckets/bucket_info.h"

build/patches/Disable-fetching-of-all-field-trials.patch

+4 −4
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v 
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc

--- a/components/variations/service/variations_field_trial_creator.cc

+++ b/components/variations/service/variations_field_trial_creator.cc

@@ -127,6 +127,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {

@@ -126,6 +126,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {

 }

 

 #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,7 +292,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c 
 // Determines whether the field trial testing config defined in

 // testing/variations/fieldtrial_testing_config.json should be applied. If the

 // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing

@@ -320,9 +321,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(

@@ -319,9 +320,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(

         std::move(client_filterable_state));

   }
@@ -302,7 +302,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c 
   platform_field_trials->RegisterFeatureOverrides(feature_list.get());

 

   base::FeatureList::SetInstance(std::move(feature_list));

@@ -652,6 +650,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(

@@ -651,6 +649,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(

     base::FeatureList* feature_list,

     SafeSeedManagerBase* safe_seed_manager,

     std::unique_ptr<ClientFilterableState> client_state) {
@@ -310,7 +310,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c 
   // This histogram name uses "VariationsFieldTrialCreator" rather than

   // "VariationsFieldTrialCreator" for consistency with historical data

   TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");

@@ -766,6 +765,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(

@@ -764,6 +763,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(

 

 void VariationsFieldTrialCreator::LoadSeedFromJsonFile(

     const base::FilePath& json_seed_path) {

build/patches/Enable-darken-websites-checkbox-in-themes.patch

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -2064,9 +2064,9 @@

@@ -2069,9 +2069,9 @@

     "expiry_milestone": -1

   },

   {