aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc')
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc33
1 files changed, 9 insertions, 24 deletions
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index 6789e1b8927b..0440d715fc59 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,35 +1,20 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2021-12-14 11:45:06 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2022-02-07 13:39:41 UTC
+++ extensions/browser/api/messaging/message_service.cc
@@ -74,7 +74,7 @@ namespace {
-
const char kReceivingEndDoesntExistError[] =
"Could not establish connection. Receiving end does not exist.";
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
- defined(OS_CHROMEOS)
+ #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)
++ defined(OS_CHROMEOS) || defined(OS_BSD)
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
+ const char kProhibitedByPoliciesError[] =
@@ -439,7 +439,7 @@ void MessageService::OpenChannelToNativeApp(
- if (!opener_port->IsValidPort())
return;
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
- defined(OS_CHROMEOS)
+ #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)
++ defined(OS_CHROMEOS) || defined(OS_BSD)
bool has_permission = extension->permissions_data()->HasAPIPermission(
mojom::APIPermissionID::kNativeMessaging);
-@@ -493,12 +493,12 @@ void MessageService::OpenChannelToNativeApp(
- channel->opener->IncrementLazyKeepaliveCount();
-
- AddChannel(std::move(channel), receiver_port_id);
--#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
-+#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
- // defined(OS_CHROMEOS))
- const char kNativeMessagingNotSupportedError[] =
- "Native Messaging is not supported on this platform.";
- opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError);
--#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
-+#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
- // defined(OS_CHROMEOS))
- }
-
+ if (!has_permission) {