aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 8c813c1db5c8..834594ad882e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2020-03-16 18:39:44 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2020-11-13 06:36:37 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -760,7 +760,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -776,7 +776,7 @@ void ExternalProviderImpl::CreateExternalProviders(
}
#endif
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
@@ -9,12 +9,12 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
-@@ -787,7 +787,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -803,7 +803,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING))
+-#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
++#if defined(OS_MAC) || defined(OS_BSD) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
+ BUILDFLAG(CHROMIUM_BRANDING))
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
- base::MakeRefCounted<ExternalPrefLoader>(