Commit 9f81732d authored by Miyoung Shin's avatar Miyoung Shin Committed by Commit Bot

Convert AudioFocusObserver to new Mojo types

This CL converts AudioFocusObserverPtr that is left only in
audio_focus_manager.cc to the new Mojo type.

Bug: 955171
Change-Id: Ifc2f73129f7b4f414f2a978affe316da49db04dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849738Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#704399}
parent a3379a53
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "base/power_monitor/power_observer.h" #include "base/power_monitor/power_observer.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "base/unguessable_token.h" #include "base/unguessable_token.h"
#include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/remote.h"
#include "services/media_session/audio_focus_request.h" #include "services/media_session/audio_focus_request.h"
#include "services/media_session/public/cpp/features.h" #include "services/media_session/public/cpp/features.h"
#include "services/media_session/public/mojom/audio_focus.mojom.h" #include "services/media_session/public/mojom/audio_focus.mojom.h"
...@@ -64,13 +64,13 @@ class AudioFocusManager::SourceObserverHolder { ...@@ -64,13 +64,13 @@ class AudioFocusManager::SourceObserverHolder {
: identity_(source_id), observer_(std::move(observer)) { : identity_(source_id), observer_(std::move(observer)) {
// Set a connection error handler so that we will remove observers that have // Set a connection error handler so that we will remove observers that have
// had an error / been closed. // had an error / been closed.
observer_.set_connection_error_handler(base::BindOnce( observer_.set_disconnect_handler(base::BindOnce(
&AudioFocusManager::CleanupSourceObservers, base::Unretained(owner))); &AudioFocusManager::CleanupSourceObservers, base::Unretained(owner)));
} }
~SourceObserverHolder() = default; ~SourceObserverHolder() = default;
bool is_valid() const { return !observer_.encountered_error(); } bool is_valid() const { return observer_.is_connected(); }
const base::UnguessableToken& identity() const { return identity_; } const base::UnguessableToken& identity() const { return identity_; }
...@@ -84,7 +84,7 @@ class AudioFocusManager::SourceObserverHolder { ...@@ -84,7 +84,7 @@ class AudioFocusManager::SourceObserverHolder {
private: private:
const base::UnguessableToken identity_; const base::UnguessableToken identity_;
mojom::AudioFocusObserverPtr observer_; mojo::Remote<mojom::AudioFocusObserver> observer_;
DISALLOW_COPY_AND_ASSIGN(SourceObserverHolder); DISALLOW_COPY_AND_ASSIGN(SourceObserverHolder);
}; };
......
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