76c5f5cc8a
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
27 lines
959 B
Diff
27 lines
959 B
Diff
From 3fcbe57ff316894349907bf1c85f71d7487f0932 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Mon, 6 Aug 2018 13:40:24 -0700
|
|
Subject: fix: [mas] don't call LaunchServices private api
|
|
|
|
---
|
|
content/gpu/gpu_main.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
|
index 115f871094bc..aa47a1c1a51e 100644
|
|
--- a/content/gpu/gpu_main.cc
|
|
+++ b/content/gpu/gpu_main.cc
|
|
@@ -276,8 +276,10 @@ int GpuMain(const MainFunctionParams& parameters) {
|
|
std::unique_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
|
|
main_message_loop.reset(new base::MessageLoop(std::move(pump)));
|
|
|
|
+#ifndef MAS_BUILD
|
|
// Tell LaunchServices to continue without a connection to the daemon.
|
|
_LSSetApplicationLaunchServicesServerConnectionStatus(0, nullptr);
|
|
+#endif
|
|
#else
|
|
main_message_loop.reset(
|
|
new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
|
|
--
|
|
2.17.0
|
|
|