|
@@ -6,15 +6,45 @@
|
|
|
|
|
|
#include <string>
|
|
|
|
|
|
+#include "atom/browser/api/atom_api_system_preferences.h"
|
|
|
#include "atom/common/native_mate_converters/accelerator_converter.h"
|
|
|
#include "atom/common/native_mate_converters/callback.h"
|
|
|
#include "base/stl_util.h"
|
|
|
+#include "base/strings/utf_string_conversions.h"
|
|
|
#include "native_mate/dictionary.h"
|
|
|
|
|
|
#include "atom/common/node_includes.h"
|
|
|
+#include "atom/common/platform_util.h"
|
|
|
+
|
|
|
+#if defined(OS_MACOSX)
|
|
|
+#include "base/mac/mac_util.h"
|
|
|
+#endif
|
|
|
|
|
|
using extensions::GlobalShortcutListener;
|
|
|
|
|
|
+namespace {
|
|
|
+
|
|
|
+#if defined(OS_MACOSX)
|
|
|
+bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
|
|
|
+ if (platform_util::IsAtLeastOS10_14()) {
|
|
|
+ constexpr ui::KeyboardCode mediaKeys[] = {
|
|
|
+ ui::VKEY_MEDIA_PLAY_PAUSE, ui::VKEY_MEDIA_NEXT_TRACK,
|
|
|
+ ui::VKEY_MEDIA_PREV_TRACK, ui::VKEY_MEDIA_STOP};
|
|
|
+
|
|
|
+ if (std::find(std::begin(mediaKeys), std::end(mediaKeys),
|
|
|
+ accelerator.key_code()) != std::end(mediaKeys)) {
|
|
|
+ bool trusted =
|
|
|
+ atom::api::SystemPreferences::IsTrustedAccessibilityClient(false);
|
|
|
+ if (!trusted)
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+}
|
|
|
+#endif
|
|
|
+
|
|
|
+} // namespace
|
|
|
+
|
|
|
namespace atom {
|
|
|
|
|
|
namespace api {
|
|
@@ -31,7 +61,7 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
|
|
|
if (accelerator_callback_map_.find(accelerator) ==
|
|
|
accelerator_callback_map_.end()) {
|
|
|
// This should never occur, because if it does, GlobalGlobalShortcutListener
|
|
|
- // notifes us with wrong accelerator.
|
|
|
+ // notifies us with wrong accelerator.
|
|
|
NOTREACHED();
|
|
|
return;
|
|
|
}
|
|
@@ -40,6 +70,11 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
|
|
|
|
|
|
bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
|
|
|
const base::Closure& callback) {
|
|
|
+#if defined(OS_MACOSX)
|
|
|
+ if (RegisteringMediaKeyForUntrustedClient(accelerator))
|
|
|
+ return false;
|
|
|
+#endif
|
|
|
+
|
|
|
if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(accelerator,
|
|
|
this)) {
|
|
|
return false;
|