Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3036d4557
Branches Tags
electron
/
patches
/
chromium
/
fix_media_key_usage_with_globalshortcuts.patch

fix_media_key_usage_with_globalshortcuts.patch 4.6 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Mon, 16 Aug 2021 17:55:32 +0200
    4. 

  4. Subject: fix: media key usage with globalShortcuts
    5. 

  5. 

  6. This patch enables media keys to work properly with Electron's globalShortcut
    7. 

  7. module. Chromium's default usage of RemoteCommandCenterDelegate on macOS falls
    8. 

  8. down into MPRemoteCommandCenter, which makes it such that an app will not
    9. 

  9. receive remote control events until it begins playing audio. This runs
    10. 

  10. counter to the design of globalShortcuts, and so we need to instead
    11. 

  11. use `ui::MediaKeysListener`.
    12. 

  12. 

  13. diff --git a/chrome/browser/extensions/global_shortcut_listener.cc b/chrome/browser/extensions/global_shortcut_listener.cc
    14. 

  14. index fa5be7e4dbddd8333263c412b84a1d93b2d5046a..1b3c65359bff41a96ff27aef6e979ac7e6e8518d 100644
    15. 

  15. --- a/chrome/browser/extensions/global_shortcut_listener.cc
    16. 

  16. +++ b/chrome/browser/extensions/global_shortcut_listener.cc
    17. 

  17. @@ -7,6 +7,7 @@
    18. 

  18.  #include "base/check.h"
    19. 

  19.  #include "base/notreached.h"
    20. 

  20.  #include "content/public/browser/browser_thread.h"
    21. 

  21. +#include "content/public/browser/media_keys_listener_manager.h"
    22. 

  22.  #include "ui/base/accelerators/accelerator.h"
    23. 

  23.  
    24. 

  24.  using content::BrowserThread;
    25. 

  25. @@ -66,6 +67,22 @@ void GlobalShortcutListener::UnregisterAccelerator(
    26. 

  26.      StopListening();
    27. 

  27.  }
    28. 

  28.  
    29. 

  29. +// static
    30. 

  30. +void GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(bool should_use) {
    31. 

  31. +  if (content::MediaKeysListenerManager::
    32. 

  32. +            IsMediaKeysListenerManagerEnabled()) {
    33. 

  33. +    content::MediaKeysListenerManager* media_keys_listener_manager =
    34. 

  34. +        content::MediaKeysListenerManager::GetInstance();
    35. 

  35. +    DCHECK(media_keys_listener_manager);
    36. 

  36. +
    37. 

  37. +    if (should_use) {
    38. 

  38. +      media_keys_listener_manager->EnableInternalMediaKeyHandling();
    39. 

  39. +    } else {
    40. 

  40. +      media_keys_listener_manager->DisableInternalMediaKeyHandling();
    41. 

  41. +    }
    42. 

  42. +  }
    43. 

  43. +}
    44. 

  44. +
    45. 

  45.  void GlobalShortcutListener::UnregisterAccelerators(Observer* observer) {
    46. 

  46.    CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
    47. 

  47.    if (IsShortcutHandlingSuspended())
    48. 

  48. diff --git a/chrome/browser/extensions/global_shortcut_listener.h b/chrome/browser/extensions/global_shortcut_listener.h
    49. 

  49. index f96af14cb915c8ab92b314ac15b6dffcdd6ec607..2556abe433493251ebd48d4aeddaa6d4f553208f 100644
    50. 

  50. --- a/chrome/browser/extensions/global_shortcut_listener.h
    51. 

  51. +++ b/chrome/browser/extensions/global_shortcut_listener.h
    52. 

  52. @@ -33,6 +33,8 @@ class GlobalShortcutListener {
    53. 

  53.  
    54. 

  54.    static GlobalShortcutListener* GetInstance();
    55. 

  55.  
    56. 

  56. +  static void SetShouldUseInternalMediaKeyHandling(bool should_use);
    57. 

  57. +
    58. 

  58.    // Register an observer for when a certain |accelerator| is struck. Returns
    59. 

  59.    // true if register successfully, or false if 1) the specificied |accelerator|
    60. 

  60.    // has been registered by another caller or other native applications, or
    61. 

  61. diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
    62. 

  62. index 169a009fd62d677955ac67df086dd658f902560c..134919f7ecedf2342139626977520b088f8b93d5 100644
    63. 

  63. --- a/content/browser/media/media_keys_listener_manager_impl.cc
    64. 

  64. +++ b/content/browser/media/media_keys_listener_manager_impl.cc
    65. 

  65. @@ -56,7 +56,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
    66. 

  66.                                 CanActiveMediaSessionControllerReceiveEvents();
    67. 

  67.  
    68. 

  68.    // Tell the underlying MediaKeysListener to listen for the key.
    69. 

  69. -  if (should_start_watching && media_keys_listener_ &&
    70. 

  70. +  if (
    71. 

  71. +#if BUILDFLAG(IS_MAC)
    72. 

  72. +      !media_key_handling_enabled_ &&
    73. 

  73. +#endif  // BUILDFLAG(IS_MAC)
    74. 

  74. +      should_start_watching && media_keys_listener_ &&
    75. 

  75.        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
    76. 

  76.      return false;
    77. 

  77.    }
    78. 

  78. @@ -240,6 +244,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
    79. 

  79.  #endif
    80. 

  80.  
    81. 

  81.    if (system_media_controls_) {
    82. 

  82. +    // This is required for proper functioning of MediaMetadata.
    83. 

  83.      system_media_controls_->AddObserver(this);
    84. 

  84.      system_media_controls_notifier_ =
    85. 

  85.          std::make_unique<SystemMediaControlsNotifier>(
    86. 

  86. @@ -252,6 +257,19 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
    87. 

  87.      DCHECK(media_keys_listener_);
    88. 

  88.    }
    89. 

  89.  
    90. 

  90. +#if BUILDFLAG(IS_MAC)
    91. 

  91. +  // Chromium's implementation of SystemMediaControls falls
    92. 

  92. +  // down into MPRemoteCommandCenter, which makes it such that an app will not
    93. 

  93. +  // will not receive remote control events until it begins playing audio.
    94. 

  94. +  // If there's not already a MediaKeysListener instance, create one so
    95. 

  95. +  // that globalShortcuts work correctly.
    96. 

  96. +  if (!media_keys_listener_) {
    97. 

  97. +    media_keys_listener_ = ui::MediaKeysListener::Create(
    98. 

  98. +        this, ui::MediaKeysListener::Scope::kGlobal);
    99. 

  99. +    DCHECK(media_keys_listener_);
    100. 

  100. +  }
    101. 

  101. +#endif
    102. 

  102. +
    103. 

  103.    EnsureAuxiliaryServices();
    104. 

  104.  }
    105. 

  105.  
    106.