summaryrefslogtreecommitdiff
path: root/www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2021-10-14 19:01:18 -0400
committerGravatar Chris Xiong <chirs241097@gmail.com> 2021-10-14 19:01:18 -0400
commit846cdbdbf965fc50478bcc4c6436e3dc6a489f3f (patch)
tree4a39385c982291a110f513871aba340f0a7a061e /www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch
downloadppo-846cdbdbf965fc50478bcc4c6436e3dc6a489f3f.tar.xz
Initial commit.
Diffstat (limited to 'www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch')
-rw-r--r--www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch b/www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch
new file mode 100644
index 0000000..6551b31
--- /dev/null
+++ b/www-client/chromium/files/chromium-93-site_settings_helper-initialzation.patch
@@ -0,0 +1,37 @@
+From 7ef6d4ad7ddc7f0c4124bc538c4bd3a8efdd37cd Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 4 Jun 2021 06:52:30 +0000
+Subject: [PATCH] GCC: fix brace-initialization with NoDestructor
+
+GCC requires brace-initialization for NoDestructor and
+std::vector<T> for base_types. Therefore change to double
+brace-initialzation.
+---
+ chrome/browser/ui/webui/settings/site_settings_helper.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
+index 7831684..4478800 100644
+--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
++++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
+@@ -410,7 +410,7 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
+ // First build the list of permissions that will be shown regardless of
+ // `origin`. Some categories such as COOKIES store their data in a custom way,
+ // so are not included here.
+- static base::NoDestructor<std::vector<ContentSettingsType>> base_types({
++ static base::NoDestructor<std::vector<ContentSettingsType>> base_types{{
+ ContentSettingsType::AR, ContentSettingsType::AUTOMATIC_DOWNLOADS,
+ ContentSettingsType::BACKGROUND_SYNC,
+ ContentSettingsType::CLIPBOARD_READ_WRITE,
+@@ -429,7 +429,7 @@ const std::vector<ContentSettingsType>& GetVisiblePermissionCategories() {
+ ContentSettingsType::SENSORS, ContentSettingsType::SERIAL_GUARD,
+ ContentSettingsType::SOUND, ContentSettingsType::USB_GUARD,
+ ContentSettingsType::VR,
+- });
++ }};
+ static bool initialized = false;
+ if (!initialized) {
+ // The permission categories in this block are only shown when running with
+--
+2.31.1
+