Commit 6fd1fb81 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Commit Bot

assistant: refactor old methods to use ensure style

Bug: None
Test: locally build and run
Change-Id: I843f45f2056e5fb8b61ccf5f27e6ff8f25595c12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876795
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709528}
parent 0b3c319b
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <vector> #include <vector>
#include "ash/public/mojom/assistant_controller.mojom.h" #include "ash/public/mojom/assistant_controller.mojom.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "chromeos/assistant/internal/action/cros_action_module.h" #include "chromeos/assistant/internal/action/cros_action_module.h"
...@@ -248,31 +249,10 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl ...@@ -248,31 +249,10 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AssistantManagerServiceImpl
void HandleLaunchMediaIntentResponse(bool app_opened); void HandleLaunchMediaIntentResponse(bool app_opened);
void OnConversationTurnStartedOnMainThread( void OnAlarmTimerStateChanged();
const assistant_client::ConversationTurnMetadata& metadata);
void OnConversationTurnFinishedOnMainThread(
assistant_client::ConversationStateListener::Resolution resolution);
void OnShowHtmlOnMainThread(const std::string& html,
const std::string& fallback);
void OnShowSuggestionsOnMainThread(
const std::vector<mojom::AssistantSuggestionPtr>& suggestions);
void OnShowTextOnMainThread(const std::string& text);
void OnOpenUrlOnMainThread(const std::string& url, bool in_background);
void OnShowNotificationOnMainThread(
const mojom::AssistantNotificationPtr& notification);
void OnNotificationRemovedOnMainThread(const std::string& grouping_id);
void OnCommunicationErrorOnMainThread(int error_code);
void OnRecognitionStateChangedOnMainThread(
assistant_client::ConversationStateListener::RecognitionState state,
const assistant_client::ConversationStateListener::RecognitionResult&
recognition_result);
void OnRespondingStartedOnMainThread(bool is_error_response);
void OnSpeechLevelUpdatedOnMainThread(const float speech_level);
void OnAlarmTimerStateChangedOnMainThread();
void OnModifySettingsAction(const std::string& modify_setting_args_proto); void OnModifySettingsAction(const std::string& modify_setting_args_proto);
void OnOpenMediaAndroidIntentOnMainThread( void OnOpenMediaAndroidIntent(const std::string play_media_args_proto,
const std::string play_media_args_proto, action::AndroidAppInfo* android_app_info);
action::AndroidAppInfo* android_app_info);
void OnPlayMedia(const std::string play_media_args_proto); void OnPlayMedia(const std::string play_media_args_proto);
void OnMediaControlAction(const std::string& action_name, void OnMediaControlAction(const std::string& action_name,
const std::string& media_action_args_proto); const std::string& media_action_args_proto);
......
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