content_settings: add force allow origins.

Chromium change: https://chromium.googlesource.com/chromium/src/+/5a7ac1444c5b0a691aa480374c6e390f3fda9741 commit 5a7ac1444c5b0a691aa480374c6e390f3fda9741 Author: Jiewei Qian <[email protected]> Date: Thu Feb 27 07:04:28 2020 +0000 content_settings: add force allow origins This CL adds support to allow individual origins in content settings. Also force allow chrome-untrusted://terminal origin to Clipboard API. Bug: 1035255
brave · Apr 10, 2020 · 6fd5cdc · 6fd5cdc
1 parent c215ff2
commit 6fd5cdc
Showing 1 changed file with 95 additions and 95 deletions.
diff --git a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
@@ -3,101 +3,101 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#define BRAVE_INIT { \
-  /* Add CONTENT_SETTING_ASK for autoplay*/ \
-  content_settings_info_.erase(ContentSettingsType::AUTOPLAY); \
-  website_settings_registry_->UnRegister(ContentSettingsType::AUTOPLAY); \
-  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW, \
-           WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-           ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, \
-                         CONTENT_SETTING_ASK), \
-           WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-           WebsiteSettingsRegistry::DESKTOP | \
-               WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-           ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-           ContentSettingsInfo::PERSISTENT, \
-           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  \
-  /* Change plugins default to CONTENT_SETTING_BLOCK*/ \
-  content_settings_info_.erase(ContentSettingsType::PLUGINS); \
-  website_settings_registry_->UnRegister(ContentSettingsType::PLUGINS); \
-  Register( \
-      ContentSettingsType::PLUGINS, "plugins", \
-      CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, \
-      WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, \
-                    CONTENT_SETTING_ASK, \
-                    CONTENT_SETTING_DETECT_IMPORTANT_CONTENT), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::EPHEMERAL, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  \
-  /* Disable background sync by default (brave/brave-browser#4709)*/ \
-  content_settings_info_.erase(ContentSettingsType::BACKGROUND_SYNC); \
-  website_settings_registry_->UnRegister( \
-      ContentSettingsType::BACKGROUND_SYNC); \
-  Register( \
-      ContentSettingsType::BACKGROUND_SYNC, "background-sync", \
-      CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, \
-      WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  \
-  /* Disable motion sensors by default (brave/brave-browser#4789)*/ \
-  content_settings_info_.erase(ContentSettingsType::SENSORS); \
-  website_settings_registry_->UnRegister(ContentSettingsType::SENSORS); \
-  Register( \
-      ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::DESKTOP | \
-          WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IN_INCOGNITO, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); \
-  /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs migration*/ \
-  /* We read only from these settings*/ \
-  Register( \
-      static_cast<ContentSettingsType>(62), "desktop-view", \
-      CONTENT_SETTING_BLOCK,  \
-      WebsiteSettingsInfo::UNSYNCABLE, \
-      WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW), \
-      WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  Register( \
-      static_cast<ContentSettingsType>(63), "play-video-in-background", \
-      CONTENT_SETTING_BLOCK, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-  Register( \
-      static_cast<ContentSettingsType>(64), "play-yt-video-in-browser", \
-      CONTENT_SETTING_ALLOW, \
-      WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(), \
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK), \
-      WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE, \
-      WebsiteSettingsRegistry::PLATFORM_ANDROID, \
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, \
-      ContentSettingsInfo::PERSISTENT, \
-      ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); \
-}
+#define BRAVE_INIT                                                             \
+  {                                                                            \
+    /* Add CONTENT_SETTING_ASK for autoplay*/                                  \
+    content_settings_info_.erase(ContentSettingsType::AUTOPLAY);               \
+    website_settings_registry_->UnRegister(ContentSettingsType::AUTOPLAY);     \
+    Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW, \
+             WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),            \
+             ForceAllowedOrigins(),                                            \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,       \
+                           CONTENT_SETTING_ASK),                               \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);  \
+                                                                               \
+    /* Change plugins default to CONTENT_SETTING_BLOCK*/                       \
+    content_settings_info_.erase(ContentSettingsType::PLUGINS);                \
+    website_settings_registry_->UnRegister(ContentSettingsType::PLUGINS);      \
+    Register(                                                                  \
+        ContentSettingsType::PLUGINS, "plugins", CONTENT_SETTING_BLOCK,        \
+        WebsiteSettingsInfo::SYNCABLE,                                         \
+        WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),            \
+        ForceAllowedOrigins(),                                                 \
+        ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,            \
+                      CONTENT_SETTING_ASK,                                     \
+                      CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),               \
+        WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,     \
+        WebsiteSettingsRegistry::DESKTOP |                                     \
+            WebsiteSettingsRegistry::PLATFORM_ANDROID,                         \
+        ContentSettingsInfo::INHERIT_IN_INCOGNITO,                             \
+        ContentSettingsInfo::EPHEMERAL,                                        \
+        ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);       \
+                                                                               \
+    /* Disable background sync by default (brave/brave-browser#4709)*/         \
+    content_settings_info_.erase(ContentSettingsType::BACKGROUND_SYNC);        \
+    website_settings_registry_->UnRegister(                                    \
+        ContentSettingsType::BACKGROUND_SYNC);                                 \
+    Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync",          \
+             CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+                                                                               \
+    /* Disable motion sensors by default (brave/brave-browser#4789)*/          \
+    content_settings_info_.erase(ContentSettingsType::SENSORS);                \
+    website_settings_registry_->UnRegister(ContentSettingsType::SENSORS);      \
+    Register(ContentSettingsType::SENSORS, "sensors", CONTENT_SETTING_BLOCK,   \
+             WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),            \
+             ForceAllowedOrigins(),                                            \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::DESKTOP |                                \
+                 WebsiteSettingsRegistry::PLATFORM_ANDROID,                    \
+             ContentSettingsInfo::INHERIT_IN_INCOGNITO,                        \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);  \
+    /* We need 62, 63, 64 for ContentSettingsTypes for Android tabs            \
+     * migration*/                                                             \
+    /* We read only from these settings*/                                      \
+    Register(                                                                  \
+        static_cast<ContentSettingsType>(62), "desktop-view",                  \
+        CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,                \
+        WhitelistedSchemes(), ForceAllowedOrigins(),                           \
+        ValidSettings(CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW),           \
+        WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,     \
+        WebsiteSettingsRegistry::PLATFORM_ANDROID,                             \
+        ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                       \
+        ContentSettingsInfo::PERSISTENT,                                       \
+        ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);               \
+    Register(static_cast<ContentSettingsType>(63), "play-video-in-background", \
+             CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::PLATFORM_ANDROID,                        \
+             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                  \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+    Register(static_cast<ContentSettingsType>(64), "play-yt-video-in-browser", \
+             CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE,           \
+             WhitelistedSchemes(), ForceAllowedOrigins(),                      \
+             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),      \
+             WebsiteSettingsInfo::SINGLE_ORIGIN_ONLY_SCOPE,                    \
+             WebsiteSettingsRegistry::PLATFORM_ANDROID,                        \
+             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,                  \
+             ContentSettingsInfo::PERSISTENT,                                  \
+             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);          \
+  }
 
 #include "../../../../../../components/content_settings/core/browser/content_settings_registry.cc"