Commit 5b2883ca authored by Muyuan Li's avatar Muyuan Li Committed by Commit Bot

add CrosDisplayConnection to assistant

Bug: 807015
Test: None
Change-Id: I6b9ae265f6105dc7160f041b7e752785180889f3
Reviewed-on: https://chromium-review.googlesource.com/941389Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Muyuan Li <muyuanli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540251}
parent 979ef78e
include_rules = [ include_rules = [
"+chromeos/assistant",
"+google_apis/gaia", "+google_apis/gaia",
"+libassistant", "+libassistant",
"+mojo/public", "+mojo/public",
......
...@@ -31,6 +31,7 @@ void AssistantManagerServiceImpl::Start(const std::string& access_token) { ...@@ -31,6 +31,7 @@ void AssistantManagerServiceImpl::Start(const std::string& access_token) {
assistant_manager_internal_->SetOptions(*internal_options, [](bool success) { assistant_manager_internal_->SetOptions(*internal_options, [](bool success) {
DVLOG(2) << "set options: " << success; DVLOG(2) << "set options: " << success;
}); });
assistant_manager_internal_->SetDisplayConnection(&display_connection_);
// By default AssistantManager will not start listening for its hotword until // By default AssistantManager will not start listening for its hotword until
// we explicitly set EnableListening() to |true|. // we explicitly set EnableListening() to |true|.
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
// TODO(xiaohuic): replace with "base/macros.h" once we remove // TODO(xiaohuic): replace with "base/macros.h" once we remove
// libassistant/contrib dependency. // libassistant/contrib dependency.
#include "chromeos/assistant/internal/cros_display_connection.h"
#include "chromeos/services/assistant/assistant_manager_service.h" #include "chromeos/services/assistant/assistant_manager_service.h"
#include "chromeos/services/assistant/platform_api_impl.h" #include "chromeos/services/assistant/platform_api_impl.h"
#include "libassistant/contrib/core/macros.h" #include "libassistant/contrib/core/macros.h"
...@@ -33,6 +34,7 @@ class AssistantManagerServiceImpl : public AssistantManagerService { ...@@ -33,6 +34,7 @@ class AssistantManagerServiceImpl : public AssistantManagerService {
void SetAccessToken(const std::string& access_token) override; void SetAccessToken(const std::string& access_token) override;
private: private:
CrosDisplayConnection display_connection_;
PlatformApiImpl platform_api_; PlatformApiImpl platform_api_;
std::unique_ptr<assistant_client::AssistantManager> assistant_manager_; std::unique_ptr<assistant_client::AssistantManager> assistant_manager_;
assistant_client::AssistantManagerInternal* const assistant_manager_internal_; assistant_client::AssistantManagerInternal* const assistant_manager_internal_;
......
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