Commit 90832ad1 authored by Tommy Steimel's avatar Tommy Steimel Committed by Commit Bot

[Global Media Controls] Prevent null RemoteCommandCenterDelegate crash

This CL adds a check to make sure there is a
RemoteCommandCenterDelegate before we attempt to create a
RemoteCommandMediaKeysListenerMac.

Bug: 938070
Change-Id: Ie216a85e5c579b7d654888d00c24b67ddaa7351d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1506108Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638244}
parent c92b0f22
......@@ -13,6 +13,7 @@
#include "base/containers/flat_set.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/accelerators/remote_command_media_keys_listener_mac.h"
#include "ui/base/now_playing/remote_command_center_delegate.h"
namespace ui {
......@@ -220,9 +221,11 @@ std::unique_ptr<MediaKeysListener> MediaKeysListener::Create(
MediaKeysListener::Delegate* delegate,
MediaKeysListener::Scope scope) {
// For Mac OS 10.12.2 or later, we want to use MPRemoteCommandCenter for
// getting media keys globally.
// getting media keys globally if there is a RemoteCommandCenterDelegate
// available.
if (@available(macOS 10.12.2, *)) {
if (scope == Scope::kGlobal) {
if (scope == Scope::kGlobal &&
now_playing::RemoteCommandCenterDelegate::GetInstance()) {
auto listener =
std::make_unique<RemoteCommandMediaKeysListenerMac>(delegate);
listener->Initialize();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment