summaryrefslogtreecommitdiff
path: root/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch')
-rw-r--r--www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
index 5b9cd42..894d468 100644
--- a/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
+++ b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch
@@ -1,16 +1,16 @@
1--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc 1--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig
2+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc 2+++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
3@@ -27,7 +27,6 @@ namespace extensions { 3@@ -28,7 +28,6 @@ namespace extensions {
4 4
5 bool IsComponentExtensionAllowlisted(const std::string& extension_id) { 5 bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
6 const char* const kAllowed[] = { 6 const char* const kAllowed[] = {
7- extension_misc::kInAppPaymentsSupportAppId, 7- extension_misc::kInAppPaymentsSupportAppId,
8 extension_misc::kPdfExtensionId, 8 extension_misc::kPdfExtensionId,
9 #if BUILDFLAG(IS_CHROMEOS) 9 #if defined(OS_CHROMEOS)
10 extension_misc::kAssessmentAssistantExtensionId, 10 extension_misc::kAssessmentAssistantExtensionId,
11--- a/chrome/browser/extensions/component_loader.cc 11--- chrome/browser/extensions/component_loader.cc.orig
12+++ b/chrome/browser/extensions/component_loader.cc 12+++ chrome/browser/extensions/component_loader.cc
13@@ -356,11 +356,6 @@ void ComponentLoader::AddWebStoreApp() { 13@@ -354,11 +354,6 @@ void ComponentLoader::AddWebStoreApp() {
14 if (!IsNormalSession()) 14 if (!IsNormalSession())
15 return; 15 return;
16 #endif 16 #endif
@@ -22,7 +22,7 @@
22 } 22 }
23 23
24 #if BUILDFLAG(IS_CHROMEOS_ASH) 24 #if BUILDFLAG(IS_CHROMEOS_ASH)
25@@ -503,18 +498,6 @@ void ComponentLoader::AddDefaultComponen 25@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen
26 AddHangoutServicesExtension(); 26 AddHangoutServicesExtension();
27 #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) 27 #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
28 28
@@ -41,8 +41,8 @@
41 #if BUILDFLAG(IS_CHROMEOS_ASH) 41 #if BUILDFLAG(IS_CHROMEOS_ASH)
42 if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) { 42 if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) {
43 base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII( 43 base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII(
44--- a/chrome/browser/extensions/external_component_loader.cc 44--- chrome/browser/extensions/external_component_loader.cc.orig
45+++ b/chrome/browser/extensions/external_component_loader.cc 45+++ chrome/browser/extensions/external_component_loader.cc
46@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon 46@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon
47 47
48 void ExternalComponentLoader::StartLoading() { 48 void ExternalComponentLoader::StartLoading() {
@@ -51,11 +51,11 @@
51- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get()); 51- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
52-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) 52-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
53 53
54 #if BUILDFLAG(IS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
55 { 55 {
56--- a/chrome/browser/extensions/webstore_installer.cc 56--- chrome/browser/extensions/webstore_installer.cc.orig
57+++ b/chrome/browser/extensions/webstore_installer.cc 57+++ chrome/browser/extensions/webstore_installer.cc
58@@ -553,20 +553,6 @@ void WebstoreInstaller::DownloadNextPend 58@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend
59 void WebstoreInstaller::DownloadCrx( 59 void WebstoreInstaller::DownloadCrx(
60 const std::string& extension_id, 60 const std::string& extension_id,
61 InstallSource source) { 61 InstallSource source) {
@@ -76,7 +76,7 @@
76 } 76 }
77 77
78 // http://crbug.com/165634 78 // http://crbug.com/165634
79@@ -709,21 +695,6 @@ void WebstoreInstaller::UpdateDownloadPr 79@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr
80 void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { 80 void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
81 DCHECK_CURRENTLY_ON(BrowserThread::UI); 81 DCHECK_CURRENTLY_ON(BrowserThread::UI);
82 DCHECK(!crx_installer_.get()); 82 DCHECK(!crx_installer_.get());