diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index fc72ec10b..9352382d7 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -18,7 +18,7 @@ Require: Content-settings-infrastructure.patch ...BromiteTimezoneOverrideContentSetting.java | 148 +++++++++++++ .../android/website_preference_bridge.cc | 16 ++ .../bromite_content_settings/timezone.grdp | 39 ++++ - .../timezone_override.inc | 23 ++ + .../timezone_override.inc | 24 +++ .../browser/content_settings_pref_provider.cc | 16 ++ .../browser/content_settings_pref_provider.h | 4 + .../core/browser/content_settings_utils.cc | 5 + @@ -33,7 +33,7 @@ Require: Content-settings-infrastructure.patch .../content_settings/core/common/pref_names.h | 2 + .../renderer/content_settings_agent_impl.cc | 81 +++++++- .../renderer/content_settings_agent_impl.h | 11 + - 23 files changed, 682 insertions(+), 2 deletions(-) + 23 files changed, 683 insertions(+), 2 deletions(-) create mode 100755 components/browser_ui/site_settings/android/java/res/layout/time_zone_select_dialog.xml create mode 100755 components/browser_ui/site_settings/android/java/res/layout/timezoneoverride_site_settings_preference.xml create mode 100755 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java @@ -628,7 +628,7 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/t new file mode 100644 --- /dev/null +++ b/components/content_settings/core/browser/bromite_content_settings/timezone_override.inc -@@ -0,0 +1,23 @@ +@@ -0,0 +1,24 @@ + Register(ContentSettingsType::TIMEZONE_OVERRIDE, "timezone-override", CONTENT_SETTING_ALLOW, + WebsiteSettingsInfo::SYNCABLE, + /*allowlisted_schemes=*/{}, @@ -649,6 +649,7 @@ new file mode 100644 + .set_description_ui(IDS_WEBSITE_SETTINGS_TIMEOVERRIDE_INFO) + .set_allowed_ui(IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED) + .set_blocked_ui(IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM) ++ .set_ask_ui(IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_CUSTOM) + .set_allowed_exceptions_ui(IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_ALLOWED) + .set_blocked_exceptions_ui(IDS_WEBSITE_SETTINGS_CATEGORY_TIMEZONE_OVERRIDE_RANDOM) + .set_mid_sentence_ui(IDS_SITE_SETTINGS_TIMEZONE_OVERRIDE_TITLE);