Commit 36f90a0e authored by yileili's avatar yileili Committed by Commit Bot

Use cast http connection in libassistant.

Bug: b:118193766
Test: Manual

Change-Id: Ia0cd58e42761b35b9f7281344266505074d59936
Reviewed-on: https://chromium-review.googlesource.com/c/1321956
Commit-Queue: Yilei Li <yileili@google.com>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607318}
parent 28c2d1ac
...@@ -107,6 +107,7 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl( ...@@ -107,6 +107,7 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl(
network::NetworkConnectionTracker* network_connection_tracker) network::NetworkConnectionTracker* network_connection_tracker)
: action_module_(std::make_unique<action::CrosActionModule>(this)), : action_module_(std::make_unique<action::CrosActionModule>(this)),
main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()), main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
chromium_api_delegate_(),
assistant_settings_manager_( assistant_settings_manager_(
std::make_unique<AssistantSettingsManagerImpl>(this)), std::make_unique<AssistantSettingsManagerImpl>(this)),
display_connection_(std::make_unique<CrosDisplayConnection>(this)), display_connection_(std::make_unique<CrosDisplayConnection>(this)),
...@@ -786,6 +787,8 @@ AssistantManagerServiceImpl::StartAssistantInternal( ...@@ -786,6 +787,8 @@ AssistantManagerServiceImpl::StartAssistantInternal(
assistant_manager_internal->SetDisplayConnection(display_connection_.get()); assistant_manager_internal->SetDisplayConnection(display_connection_.get());
assistant_manager_internal->RegisterActionModule(action_module_.get()); assistant_manager_internal->RegisterActionModule(action_module_.get());
assistant_manager_internal->SetAssistantManagerDelegate(this); assistant_manager_internal->SetAssistantManagerDelegate(this);
assistant_manager_internal->GetFuchsiaApiHelperOrDie()->SetFuchsiaApiDelegate(
&chromium_api_delegate_);
assistant_manager->AddConversationStateListener(this); assistant_manager->AddConversationStateListener(this);
assistant_manager->AddDeviceStateListener(this); assistant_manager->AddDeviceStateListener(this);
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "chromeos/assistant/internal/internal_util.h" #include "chromeos/assistant/internal/internal_util.h"
#include "chromeos/services/assistant/assistant_manager_service.h" #include "chromeos/services/assistant/assistant_manager_service.h"
#include "chromeos/services/assistant/assistant_settings_manager_impl.h" #include "chromeos/services/assistant/assistant_settings_manager_impl.h"
#include "chromeos/services/assistant/chromium_api_delegate.h"
#include "chromeos/services/assistant/platform_api_impl.h" #include "chromeos/services/assistant/platform_api_impl.h"
#include "chromeos/services/assistant/public/mojom/assistant.mojom.h" #include "chromeos/services/assistant/public/mojom/assistant.mojom.h"
#include "libassistant/shared/internal_api/assistant_manager_delegate.h" #include "libassistant/shared/internal_api/assistant_manager_delegate.h"
...@@ -212,6 +213,7 @@ class AssistantManagerServiceImpl ...@@ -212,6 +213,7 @@ class AssistantManagerServiceImpl
std::unique_ptr<PlatformApiImpl> platform_api_; std::unique_ptr<PlatformApiImpl> platform_api_;
std::unique_ptr<action::CrosActionModule> action_module_; std::unique_ptr<action::CrosActionModule> action_module_;
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
ChromiumApiDelegate chromium_api_delegate_;
std::unique_ptr<assistant_client::AssistantManager> assistant_manager_; std::unique_ptr<assistant_client::AssistantManager> assistant_manager_;
std::unique_ptr<AssistantSettingsManagerImpl> assistant_settings_manager_; std::unique_ptr<AssistantSettingsManagerImpl> assistant_settings_manager_;
// same ownership as assistant_manager_. // same ownership as assistant_manager_.
......
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