b7d25ccb77
* chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch1600387* update desktop_media_list.patch1729156* update notification_provenance.patch1742779* update printing.patch1646772* update verbose_generate_bpad_syms.patch1745986* update patch metadata * remove printing_compositor manifests1742734* update for URLLoaderFactoryType enum1754716* remove gin string16 converter1750093* ClearCompositorFrame() has been removed1746301* message_loop -> message_loop_current1738552* include resource_response header * pdf compositor no longer uses service manager1742734* chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore1708767* fix: make std::hash value-non-const broken by1711202* update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback1753006* chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to1678182and update for1678182* convert CookieChangeListener to new Mojo types1753371* rename ui::ClipboardType -> ui::ClipboardBuffer1758730* logging::LoggingSettings log_file -> log_file_path1699477* roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch1759149* update printing patch * update cookie usage and fn signatures1758437* chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch1762335* Convert enum to enum class for FocusManager::FocusChangeReason1767281* roll DEPS to latest lkgr * update dom_storage_limits.patch1767556
53 lines
2 KiB
Diff
53 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <sattard@slack-corp.com>
|
|
Date: Mon, 4 Mar 2019 14:51:45 -0800
|
|
Subject: fix_disable_usage_of_setapplicationisdaemon_and.patch
|
|
|
|
Disable usage of SetApplicationIsDaemon and
|
|
_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds
|
|
|
|
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
|
|
index 9b0759ab820ddb0e2a9e609b88bbc1673607c4e3..2392fd01736550f404304df324da9d81dfb3d446 100644
|
|
--- a/content/utility/utility_service_factory.cc
|
|
+++ b/content/utility/utility_service_factory.cc
|
|
@@ -196,7 +196,7 @@ void UtilityServiceFactory::RunService(
|
|
std::unique_ptr<service_manager::Service>
|
|
UtilityServiceFactory::CreateAudioService(
|
|
mojo::PendingReceiver<service_manager::mojom::Service> receiver) {
|
|
-#if defined(OS_MACOSX)
|
|
+#if defined(OS_MACOSX) && !defined(MAS_BUILD)
|
|
// Don't connect to launch services when running sandboxed
|
|
// (https://crbug.com/874785).
|
|
if (base::FeatureList::IsEnabled(
|
|
diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc
|
|
index caa30bb378b30331f90057fe7ce3aec724104bf8..a766daa808495f7872051e129c6ad9f76f54e4fe 100644
|
|
--- a/sandbox/mac/system_services.cc
|
|
+++ b/sandbox/mac/system_services.cc
|
|
@@ -9,16 +9,19 @@
|
|
|
|
#include "base/mac/mac_logging.h"
|
|
|
|
+#if !defined(MAS_BUILD)
|
|
extern "C" {
|
|
OSStatus SetApplicationIsDaemon(Boolean isDaemon);
|
|
void _LSSetApplicationLaunchServicesServerConnectionStatus(
|
|
uint64_t flags,
|
|
bool (^connection_allowed)(CFDictionaryRef options));
|
|
} // extern "C"
|
|
+#endif
|
|
|
|
namespace sandbox {
|
|
|
|
void DisableLaunchServices() {
|
|
+ #if !defined(MAS_BUILD)
|
|
// Allow the process to continue without a LaunchServices ASN. The
|
|
// INIT_Process function in HIServices will abort if it cannot connect to
|
|
// launchservicesd to get an ASN. By setting this flag, HIServices skips
|
|
@@ -32,6 +35,7 @@ void DisableLaunchServices() {
|
|
0, ^bool(CFDictionaryRef options) {
|
|
return false;
|
|
});
|
|
+ #endif
|
|
}
|
|
|
|
} // namespace sandbox
|