diff --git a/CHANGELOG.md b/CHANGELOG.md index aae328e9..21099599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 92.0.4515.176 +* use upstream feature to prevent default search engine permissions grants +* slightly improve error message for gateway attacks prevention error + # 92.0.4515.134 # 92.0.4515.125 diff --git a/build/RELEASE b/build/RELEASE index 4d3f9819..3e51e42c 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -92.0.4515.134 +92.0.4515.176 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 0c61c10b..1df54774 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -76,7 +76,7 @@ Remove-SMS-integration.patch Do-not-compile-QR-code-sharing.patch Allow-website-sign-in-without-account-sign-in.patch Offer-builtin-autocomplete-for-chrome-flags.patch -Do-not-grant-notifications-to-default-search-engine.patch +Disable-search-engine-DSE-automatic-permission.patch Add-flag-to-disable-IPv6-probes.patch Add-a-proxy-configuration-page.patch Use-4-tile-rows-never-show-logo.patch diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 142764f4..b65f6cf7 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -99,8 +99,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -350,6 +351,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomization{ - "AdaptiveButtonInTopToolbarCustomization", +@@ -351,6 +352,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ + "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kAllowUserCertificates = { @@ -119,7 +119,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser +extern const base::Feature kAllowUserCertificates; // Alphabetical: extern const base::Feature kAdaptiveButtonInTopToolbar; - extern const base::Feature kAdaptiveButtonInTopToolbarCustomization; + extern const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2; diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java @@ -140,8 +140,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; - public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION = - "AdaptiveButtonInTopToolbarCustomization"; + public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = + "AdaptiveButtonInTopToolbarCustomizationV2"; diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 0ba82308..1fced4b0 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -494,7 +494,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -421,7 +421,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", +@@ -422,7 +422,7 @@ const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognitoAvailableToThirdParty{ diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 8a19a944..86c329f3 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -1297,7 +1297,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCastDeviceFilter, &kCloseTabSuggestions, &kCriticalPersistedTabData, -@@ -759,6 +760,10 @@ const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", +@@ -760,6 +761,10 @@ const base::Feature kVrBrowsingFeedback{"VrBrowsingFeedback", const base::Feature kWebNotesStylize{"WebNotesStylize", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -1322,7 +1322,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -512,6 +512,7 @@ public abstract class ChromeFeatureList { +@@ -513,6 +513,7 @@ public abstract class ChromeFeatureList { public static final String WEBNOTES_STYLIZE = "WebNotesStylize"; public static final String WIPE_DATA_ON_CHILD_ACCOUNT_SIGNIN = "WipeDataOnChildAccountSignin"; public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; diff --git a/build/patches/Add-vibration-flag.patch b/build/patches/Add-vibration-flag.patch index 43bf1e2a..98bc2895 100644 --- a/build/patches/Add-vibration-flag.patch +++ b/build/patches/Add-vibration-flag.patch @@ -89,8 +89,8 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co +CONTENT_EXPORT extern const base::Feature kVibration; + #if defined(OS_MAC) - CONTENT_EXPORT extern const base::Feature kDesktopCaptureMacV2; - CONTENT_EXPORT extern const base::Feature kWindowCaptureMacV2; + CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac; + CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer; diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index 6fb6e31b..db06f0d6 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -161,7 +161,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc -@@ -79,6 +79,15 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect( +@@ -124,9 +124,36 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect( return ConnectResult::kException; } @@ -170,14 +170,10 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b + if (ShouldBlockGateWayAttacks(requestor_space, url_)) { + state_ = kClosed; + exception_state.ThrowSecurityError( -+ "Access to this address is not allowed."); ++ "Access to address of '" + url_.Host() + "' is not allowed from '" + execution_context->addressSpaceForBindings() + "' address space."); + return ConnectResult::kException; + } + - if (!execution_context->GetContentSecurityPolicyForCurrentWorld() - ->AllowConnectToSource(url_, url_, RedirectStatus::kNoRedirect)) { - state_ = kClosed; -@@ -127,6 +136,24 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect( return ConnectResult::kSuccess; } diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index f8307861..59a0347d 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -233,7 +233,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" -@@ -606,6 +607,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -607,6 +608,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { job_factory->SetProtocolHandler(scheme_handler.first, std::move(scheme_handler.second)); } diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index de0faaeb..fb83470a 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -1760,7 +1760,7 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/br diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h --- a/chrome/browser/permissions/chrome_permissions_client.h +++ b/chrome/browser/permissions/chrome_permissions_client.h -@@ -43,9 +43,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { +@@ -46,9 +46,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { GetUkmSourceIdCallback callback) override; permissions::IconId GetOverrideIconId( permissions::RequestType request_type) override; diff --git a/build/patches/Disable-search-engine-DSE-automatic-permission.patch b/build/patches/Disable-search-engine-DSE-automatic-permission.patch new file mode 100644 index 00000000..0bff0471 --- /dev/null +++ b/build/patches/Disable-search-engine-DSE-automatic-permission.patch @@ -0,0 +1,23 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Thu, 19 Aug 2021 23:11:16 +0200 +Subject: Disable search engine DSE automatic permission + +--- + components/permissions/features.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/permissions/features.cc b/components/permissions/features.cc +--- a/components/permissions/features.cc ++++ b/components/permissions/features.cc +@@ -54,7 +54,7 @@ const base::Feature kPermissionPredictionServiceUseUrlOverride{ + // When enabled, the Default Search Engine does not automatically receive the + // "geolocation" and "notifications" permissions. DSE only applies to Android. + const base::Feature kRevertDSEAutomaticPermissions{ +- "RevertDSEAutomaticPermissions", base::FEATURE_DISABLED_BY_DEFAULT}; ++ "RevertDSEAutomaticPermissions", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif // defined(OS_ANDROID) + + } // namespace features +-- +2.17.1 + diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 7e0b9369..3774acd1 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCCTResourcePrefetch, &kDarkenWebsitesCheckboxInThemesSetting, &kDontAutoHideBrowserControls, -@@ -460,6 +461,9 @@ const base::Feature kChromeStartupDelegate{"ChromeStartupDelegate", +@@ -461,6 +462,9 @@ const base::Feature kChromeStartupDelegate{"ChromeStartupDelegate", const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch deleted file mode 100644 index 82807be3..00000000 --- a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch +++ /dev/null @@ -1,64 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sat, 10 Nov 2018 19:47:39 +0100 -Subject: Do not grant notifications to default search engine - -Block gelocation by default instead of granting it for non-enterprise use cases (almost the totality of users) ---- - .../search_permissions_service.cc | 20 ++++++------------- - 1 file changed, 6 insertions(+), 14 deletions(-) - -diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc ---- a/chrome/browser/android/search_permissions/search_permissions_service.cc -+++ b/chrome/browser/android/search_permissions/search_permissions_service.cc -@@ -193,7 +193,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) { - DCHECK(dse_url.is_empty() || IsPermissionControlledByDSE(type, dse_origin)); - - if (!dse_url.is_empty()) -- SetContentSetting(dse_url, type, CONTENT_SETTING_ALLOW); -+ SetContentSetting(dse_url, type, CONTENT_SETTING_BLOCK); - } - - void SearchPermissionsService::ResetDSEPermissions() { -@@ -336,11 +336,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { - return; - } - -- // If we get to here, the DSE is not disabled by enterprise policy. If it was -- // previously enterprise controlled, we initialize the setting to BLOCK since -- // we don't know what the user's setting was previously. -- bool was_enterprise_controlled = -- pref_service_->GetBoolean(prefs::kDSEWasDisabledByPolicy); -+ // If this line is reached then DSE is not disabled by enterprise policy. - pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy); - - // Initialize the pref for geolocation if it hasn't been initialized yet. -@@ -373,10 +369,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { - pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated); - } else if (dse_geolocation_setting == CONTENT_SETTING_ASK) { - // If the user hasn't explicitly allowed or blocked geolocation for the -- // DSE, initialize it to allowed. -- dse_geolocation_setting = was_enterprise_controlled -- ? CONTENT_SETTING_BLOCK -- : CONTENT_SETTING_ALLOW; -+ // DSE, initialize it to blocked. -+ dse_geolocation_setting = CONTENT_SETTING_BLOCK; - } - - // Update the content setting with the auto-grants for the DSE. -@@ -401,11 +395,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { - GetContentSetting(dse_origin, ContentSettingsType::NOTIFICATIONS); - ContentSetting dse_notifications_setting = notifications_setting_to_restore; - // If the user hasn't explicitly allowed or blocked notifications for the -- // DSE, initialize it to allowed. -+ // DSE, initialize it to blocked. - if (dse_notifications_setting == CONTENT_SETTING_ASK) { -- dse_notifications_setting = was_enterprise_controlled -- ? CONTENT_SETTING_BLOCK -- : CONTENT_SETTING_ALLOW; -+ dse_notifications_setting = CONTENT_SETTING_BLOCK; - } - - // Update the content setting with the auto-grants for the DSE. --- -2.17.1 - diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index fd4ba105..1ecd338c 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -528,7 +528,7 @@ const base::Feature kContextualSearchTranslations{ +@@ -529,7 +529,7 @@ const base::Feature kContextualSearchTranslations{ "ContextualSearchTranslations", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kDarkenWebsitesCheckboxInThemesSetting{ diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index d5eff1eb..d12da651 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -62,7 +62,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); AddCookieHeaderAndStart(); -@@ -523,6 +527,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -522,6 +526,7 @@ void URLRequestHttpJob::AddExtraHeaders() { if (request_->Supports(SourceStream::SourceType::TYPE_DEFLATE)) { advertised_encoding_names.push_back("deflate"); } @@ -70,7 +70,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // Advertise "br" encoding only if transferred data is opaque to proxy. if (request()->context()->enable_brotli() && request_->Supports(SourceStream::SourceType::TYPE_BROTLI)) { -@@ -531,6 +536,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -530,6 +535,7 @@ void URLRequestHttpJob::AddExtraHeaders() { advertised_encoding_names.push_back("br"); } } @@ -78,7 +78,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque if (!advertised_encoding_names.empty()) { // Tell the server what compression formats are supported. request_info_.extra_headers.SetHeader( -@@ -540,7 +546,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -539,7 +545,7 @@ void URLRequestHttpJob::AddExtraHeaders() { } } diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 63d51778..2a009733 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -118,7 +118,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kRelatedSearchesUi, &kSearchEnginePromoExistingDevice, -@@ -623,6 +624,9 @@ const base::Feature kRelatedSearches{"RelatedSearches", +@@ -624,6 +625,9 @@ const base::Feature kRelatedSearches{"RelatedSearches", const base::Feature kRelatedSearchesUi{"RelatedSearchesUi", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 18a6d54d..6efe9782 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -372,7 +372,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kFocusOmniboxInIncognitoTabIntents, &kGoogleLensSdkIntent, &kHandleMediaIntents, -@@ -601,6 +602,9 @@ const base::Feature kOfflineIndicatorV2{"OfflineIndicatorV2", +@@ -602,6 +603,9 @@ const base::Feature kOfflineIndicatorV2{"OfflineIndicatorV2", const base::Feature kOfflineMeasurementsBackgroundTask{ "OfflineMeasurementsBackgroundTask", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index 957b6423..241f6575 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -335,17 +335,17 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -365,6 +365,10 @@ public class WebsitePreferenceBridge { +@@ -370,6 +370,10 @@ public class WebsitePreferenceBridge { + void setSettingForOrigin(BrowserContextHandle browserContextHandle, + @ContentSettingsType int contentSettingsType, String origin, String embedder, int value); - boolean isPermissionControlledByDSE(BrowserContextHandle browserContextHandle, - @ContentSettingsType int contentSettingsType, String origin); + void getAutoplayOrigins( + BrowserContextHandle browserContextHandle, Object list, boolean managedOnly); + void setAutoplaySettingForOrigin( + BrowserContextHandle browserContextHandle, String origin, int value); - boolean getAdBlockingActivated(BrowserContextHandle browserContextHandle, String origin); - boolean isContentSettingEnabled( - BrowserContextHandle browserContextHandle, int contentSettingType); + boolean isPermissionControlledByDSE(BrowserContextHandle browserContextHandle, + @ContentSettingsType int contentSettingsType, String origin); + boolean isDSEOrigin(BrowserContextHandle browserContextHandle, String origin); diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc @@ -367,7 +367,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid static jboolean JNI_WebsitePreferenceBridge_IsContentSettingsPatternValid( JNIEnv* env, const JavaParamRef& pattern) { -@@ -804,6 +815,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( +@@ -813,6 +824,7 @@ static void JNI_WebsitePreferenceBridge_SetContentSettingEnabled( case ContentSettingsType::POPUPS: case ContentSettingsType::SENSORS: case ContentSettingsType::SOUND: @@ -375,7 +375,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid value = CONTENT_SETTING_ALLOW; break; default: -@@ -884,6 +896,17 @@ static jboolean JNI_WebsitePreferenceBridge_IsContentSettingUserModifiable( +@@ -893,6 +905,17 @@ static jboolean JNI_WebsitePreferenceBridge_IsContentSettingUserModifiable( static_cast(content_settings_type)); } diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index f90e6e45..07558a35 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -912,7 +912,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -222,6 +222,8 @@ public class WebsitePreferenceBridge { +@@ -229,6 +229,8 @@ public class WebsitePreferenceBridge { switch (contentSettingsType) { case ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER: return true; @@ -921,7 +921,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c default: return false; } -@@ -323,6 +325,14 @@ public class WebsitePreferenceBridge { +@@ -330,6 +332,14 @@ public class WebsitePreferenceBridge { contentSettingType, primaryPattern, secondaryPattern, setting); } @@ -936,7 +936,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c @NativeMethods public interface Natives { boolean isNotificationEmbargoedForOrigin( -@@ -376,5 +386,7 @@ public class WebsitePreferenceBridge { +@@ -384,5 +394,7 @@ public class WebsitePreferenceBridge { boolean isContentSettingManagedByCustodian( BrowserContextHandle browserContextHandle, int contentSettingType); boolean getLocationAllowedByPolicy(BrowserContextHandle browserContextHandle); @@ -947,7 +947,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -903,3 +903,19 @@ static jboolean JNI_WebsitePreferenceBridge_GetLocationAllowedByPolicy( +@@ -912,3 +912,19 @@ static jboolean JNI_WebsitePreferenceBridge_GetLocationAllowedByPolicy( ->GetDefaultContentSetting(ContentSettingsType::GEOLOCATION, nullptr) == CONTENT_SETTING_ALLOW; }