Index: components/arc/arc_bridge_service.cc |
diff --git a/components/arc/arc_bridge_service.cc b/components/arc/arc_bridge_service.cc |
index f8babc2beedd08c04b7e8949cf8f5ef7d4318e2d..1534f714ee66b7d427f03a1f09948019e174192d 100644 |
--- a/components/arc/arc_bridge_service.cc |
+++ b/components/arc/arc_bridge_service.cc |
@@ -60,6 +60,8 @@ void ArcBridgeService::AddObserver(Observer* observer) { |
// them explicitly now to avoid a race. |
if (app_instance()) |
observer->OnAppInstanceReady(); |
+ if (audio_instance()) |
+ observer->OnAudioInstanceReady(); |
if (auth_instance()) |
observer->OnAuthInstanceReady(); |
if (clipboard_instance()) |
@@ -109,6 +111,29 @@ void ArcBridgeService::CloseAppChannel() { |
FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceClosed()); |
} |
+void ArcBridgeService::OnAudioInstanceReady(AudioInstancePtr audio_ptr) { |
+ DCHECK(CalledOnValidThread()); |
+ temporary_audio_ptr_ = std::move(audio_ptr); |
+ temporary_audio_ptr_.QueryVersion(base::Bind( |
+ &ArcBridgeService::OnAudioVersionReady, weak_factory_.GetWeakPtr())); |
+} |
+ |
+void ArcBridgeService::OnAudioVersionReady(int32_t version) { |
+ DCHECK(CalledOnValidThread()); |
+ audio_ptr_ = std::move(temporary_audio_ptr_); |
+ audio_ptr_.set_connection_error_handler(base::Bind( |
+ &ArcBridgeService::CloseAudioChannel, weak_factory_.GetWeakPtr())); |
+ FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceReady()); |
+} |
+ |
+void ArcBridgeService::CloseAudioChannel() { |
+ if (!audio_ptr_) |
+ return; |
+ |
+ audio_ptr_.reset(); |
+ FOR_EACH_OBSERVER(Observer, observer_list(), OnAudioInstanceClosed()); |
+} |
+ |
void ArcBridgeService::OnAuthInstanceReady(AuthInstancePtr auth_ptr) { |
DCHECK(CalledOnValidThread()); |
temporary_auth_ptr_ = std::move(auth_ptr); |