Merge pull request #787 from uazo/create-pull-request/patch-706aa53

Git apply result for master branch
uazo · Feb 8, 2024 · 0543a8a · 0543a8a
2 parents 706aa53 + 30e471d
commit 0543a8a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
@@ -1991,7 +1991,7 @@ new file mode 100644
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -3938,6 +3938,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -3940,6 +3940,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 

diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch
@@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -14908,6 +14908,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -14917,6 +14917,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
 
@@ -730,7 +730,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2657,6 +2657,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2659,6 +2659,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
 

diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch
@@ -437,7 +437,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -501,4 +501,7 @@ std::vector<std::string> GetModulesOrder() {
+@@ -502,4 +502,7 @@ std::vector<std::string> GetModulesOrder() {
                             base::SplitResult::SPLIT_WANT_NONEMPTY);
  }
 

diff --git a/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch b/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
@@ -8206,7 +8206,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
      "//components/assist_ranker/proto",
      "//components/autofill/content/browser:test_support",
      "//components/background_sync",
-@@ -10381,6 +10407,7 @@ if (!is_android) {
+@@ -10378,6 +10404,7 @@ if (!is_android) {
 
      public_deps = [
        "//chrome/browser:test_support_ui",

diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
@@ -93,7 +93,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//chrome/browser/headless",
      "//chrome/browser/profiles",
      "//chrome/common",
-@@ -7839,8 +7833,6 @@ static_library("browser") {
+@@ -7838,8 +7832,6 @@ static_library("browser") {
        "supervised_user/kids_chrome_management/kids_chrome_management_client_factory.h",
        "supervised_user/supervised_user_browser_utils.cc",
        "supervised_user/supervised_user_browser_utils.h",