0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add csagan5 suggestion

Browse source
This commit is contained in:
Carmelo Messina 2022-04-08 17:53:24 +02:00
parent 98dd4a5095
commit 334744dfe5
No known key found for this signature in database
GPG key ID: 968894BE688289FD
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/patches/Add-lifetime-options-permissions.patch
View file

@ -21,7 +21,7 @@ see also: https://github.com/bromite/bromite/issues/1549
.../android/website_preference_bridge.cc | 7 +-
.../strings/android/browser_ui_strings.grd | 5 ++
components/content_settings/android/BUILD.gn | 1 +
.../core/browser/content_settings_utils.cc | 28 +++++++
.../core/browser/content_settings_utils.cc | 29 +++++++
.../core/browser/content_settings_utils.h | 6 ++
.../core/browser/host_content_settings_map.cc | 2 +-
.../core/common/content_settings.cc | 7 +-
@ -49,7 +49,7 @@ see also: https://github.com/bromite/bromite/issues/1549
.../permissions/permission_request_manager.cc | 38 ++++++---
.../permissions/permission_request_manager.h | 11 ++-
media/base/media_switches.cc | 2 +-
39 files changed, 481 insertions(+), 63 deletions(-)
39 files changed, 482 insertions(+), 63 deletions(-)
diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
--- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@ -335,13 +335,14 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -187,4 +187,32 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
@@ -187,4 +187,33 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
return base::Time::Now() + duration;
}
+ContentSettingConstraints GetConstraintSessionExpiration(LifetimeMode lifetime_mode) {
+ if (lifetime_mode == LifetimeMode::OnlyThisTime) {
+ // note: this content settings will be discarded immediately
+ // 1h is used as a magic constant to identify the one-time lifetime mode
+ return {base::Time() + base::Hours(1), content_settings::SessionModel::UserSession};
+ } else if (lifetime_mode == LifetimeMode::UntilOriginClosed) {
+ return {base::Time::Now() + base::Hours(24), content_settings::SessionModel::UserSession};