Commit 70a3ddd2 authored by David Black's avatar David Black Committed by Commit Bot

Add is_mic_open parameter to OnConversationTurnStarted.

Bug: b:80186902
Change-Id: I64ff4ee52144ec15cfeedeeb1ab091aee18ea9e5
Reviewed-on: https://chromium-review.googlesource.com/1115512Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575500}
parent d971b4ca
...@@ -257,12 +257,12 @@ void AssistantManagerServiceImpl::DismissNotification( ...@@ -257,12 +257,12 @@ void AssistantManagerServiceImpl::DismissNotification(
dismissed_interaction, "DismissNotification", options, [](auto) {}); dismissed_interaction, "DismissNotification", options, [](auto) {});
} }
void AssistantManagerServiceImpl::OnConversationTurnStarted() { void AssistantManagerServiceImpl::OnConversationTurnStarted(bool is_mic_open) {
main_thread_task_runner_->PostTask( main_thread_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::BindOnce( base::BindOnce(
&AssistantManagerServiceImpl::OnConversationTurnStartedOnMainThread, &AssistantManagerServiceImpl::OnConversationTurnStartedOnMainThread,
weak_factory_.GetWeakPtr())); weak_factory_.GetWeakPtr(), is_mic_open));
} }
void AssistantManagerServiceImpl::OnConversationTurnFinished( void AssistantManagerServiceImpl::OnConversationTurnFinished(
...@@ -560,7 +560,9 @@ void AssistantManagerServiceImpl::OnStartFinished() { ...@@ -560,7 +560,9 @@ void AssistantManagerServiceImpl::OnStartFinished() {
RegisterFallbackMediaHandler(); RegisterFallbackMediaHandler();
} }
void AssistantManagerServiceImpl::OnConversationTurnStartedOnMainThread() { void AssistantManagerServiceImpl::OnConversationTurnStartedOnMainThread(
bool is_mic_open) {
// TODO(dmblack): Pipe |is_mic_open| through the OnInteractionStarted event.
interaction_subscribers_.ForAllPtrs( interaction_subscribers_.ForAllPtrs(
[](auto* ptr) { ptr->OnInteractionStarted(); }); [](auto* ptr) { ptr->OnInteractionStarted(); });
} }
......
...@@ -108,7 +108,7 @@ class AssistantManagerServiceImpl ...@@ -108,7 +108,7 @@ class AssistantManagerServiceImpl
void OnSpeechLevelUpdated(float speech_level) override; void OnSpeechLevelUpdated(float speech_level) override;
// assistant_client::ConversationStateListener overrides: // assistant_client::ConversationStateListener overrides:
void OnConversationTurnStarted() override; void OnConversationTurnStarted(bool is_mic_open) override;
void OnConversationTurnFinished( void OnConversationTurnFinished(
assistant_client::ConversationStateListener::Resolution resolution) assistant_client::ConversationStateListener::Resolution resolution)
override; override;
...@@ -158,7 +158,7 @@ class AssistantManagerServiceImpl ...@@ -158,7 +158,7 @@ class AssistantManagerServiceImpl
base::RepeatingCallback<void(const std::string&)> callback, base::RepeatingCallback<void(const std::string&)> callback,
const std::string& result); const std::string& result);
void OnConversationTurnStartedOnMainThread(); void OnConversationTurnStartedOnMainThread(bool is_mic_open);
void OnConversationTurnFinishedOnMainThread( void OnConversationTurnFinishedOnMainThread(
assistant_client::ConversationStateListener::Resolution resolution); assistant_client::ConversationStateListener::Resolution resolution);
void OnShowHtmlOnMainThread(const std::string& html); void OnShowHtmlOnMainThread(const std::string& html);
......
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