diff options
Diffstat (limited to 'www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch')
| -rw-r--r-- | www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch index 4ee53be..c6cf1a7 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/doh-changes.patch | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | --- chrome/common/chrome_features.cc.orig | 1 | --- a/chrome/common/chrome_features.cc |
| 2 | +++ chrome/common/chrome_features.cc | 2 | +++ b/chrome/common/chrome_features.cc |
| 3 | @@ -323,12 +323,7 @@ const base::Feature kDesktopPWAsWebBundl | 3 | @@ -329,12 +329,7 @@ const base::Feature kDesktopPWAsWebAppSe |
| 4 | // Enable DNS over HTTPS (DoH). | 4 | // Enable DNS over HTTPS (DoH). |
| 5 | const base::Feature kDnsOverHttps { | 5 | const base::Feature kDnsOverHttps { |
| 6 | "DnsOverHttps", | 6 | "DnsOverHttps", |
| 7 | -#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ | 7 | -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ |
| 8 | - defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) | 8 | - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) |
| 9 | - base::FEATURE_ENABLED_BY_DEFAULT | 9 | - base::FEATURE_ENABLED_BY_DEFAULT |
| 10 | -#else | 10 | -#else |
| 11 | base::FEATURE_DISABLED_BY_DEFAULT | 11 | base::FEATURE_DISABLED_BY_DEFAULT |
| @@ -13,9 +13,9 @@ | |||
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | // Provides a mechanism to remove providers from the dropdown list in the | 15 | // Provides a mechanism to remove providers from the dropdown list in the |
| 16 | --- net/dns/public/doh_provider_entry.cc.orig | 16 | --- a/net/dns/public/doh_provider_entry.cc |
| 17 | +++ net/dns/public/doh_provider_entry.cc | 17 | +++ b/net/dns/public/doh_provider_entry.cc |
| 18 | @@ -117,24 +117,6 @@ const DohProviderEntry::List& DohProvide | 18 | @@ -125,24 +125,6 @@ const DohProviderEntry::List& DohProvide |
| 19 | /*privacy_policy=*/"https://dns.sb/privacy/", | 19 | /*privacy_policy=*/"https://dns.sb/privacy/", |
| 20 | /*display_globally=*/false, /*display_countries=*/{"EE", "DE"}, | 20 | /*display_globally=*/false, /*display_countries=*/{"EE", "DE"}, |
| 21 | LoggingLevel::kNormal), | 21 | LoggingLevel::kNormal), |
| @@ -40,14 +40,14 @@ | |||
| 40 | new DohProviderEntry("Iij", DohProviderIdForHistogram::kIij, | 40 | new DohProviderEntry("Iij", DohProviderIdForHistogram::kIij, |
| 41 | {} /* ip_strs */, {} /* dns_over_tls_hostnames */, | 41 | {} /* ip_strs */, {} /* dns_over_tls_hostnames */, |
| 42 | "https://public.dns.iij.jp/dns-query", | 42 | "https://public.dns.iij.jp/dns-query", |
| 43 | --- services/network/public/cpp/features.cc.orig | 43 | --- a/services/network/public/cpp/features.cc |
| 44 | +++ services/network/public/cpp/features.cc | 44 | +++ b/services/network/public/cpp/features.cc |
| 45 | @@ -114,12 +114,7 @@ const base::Feature kSplitAuthCacheByNet | 45 | @@ -92,12 +92,7 @@ const base::Feature kSplitAuthCacheByNet |
| 46 | // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. | 46 | // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. |
| 47 | const base::Feature kDnsOverHttpsUpgrade { | 47 | const base::Feature kDnsOverHttpsUpgrade { |
| 48 | "DnsOverHttpsUpgrade", | 48 | "DnsOverHttpsUpgrade", |
| 49 | -#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID) || \ | 49 | -#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || \ |
| 50 | - defined(OS_WIN) | 50 | - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) |
| 51 | - base::FEATURE_ENABLED_BY_DEFAULT | 51 | - base::FEATURE_ENABLED_BY_DEFAULT |
| 52 | -#else | 52 | -#else |
| 53 | base::FEATURE_DISABLED_BY_DEFAULT | 53 | base::FEATURE_DISABLED_BY_DEFAULT |