Initilize ActionModule with AssistantEventObserver.

Change-Id: I382c31196514ca276f4ba49cfd0ea21b3697ed73
Reviewed-on: https://chromium-review.googlesource.com/957344
Commit-Queue: Li Lin <llin@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543237}

chromeos/services/assistant/BUILD.gn

@@ -44,7 +44,6 @@ source_set("lib") {
     ]
 
     deps += [
-      "//chromeos/assistant/internal",
       "//chromeos/assistant/internal/action",
       "//libassistant/contrib/core",
       "//libassistant/contrib/platform/audio",

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "chromeos/assistant/internal/action/cros_action_module.h"
 #include "chromeos/assistant/internal/internal_constants.h"
 #include "chromeos/assistant/internal/internal_util.h"
 #include "libassistant/shared/internal_api/assistant_manager_internal.h"
@@ -17,14 +16,12 @@ namespace assistant {
 
 AssistantManagerServiceImpl::AssistantManagerServiceImpl()
     : platform_api_(kDefaultConfigStr),
-      action_module_(std::make_unique<action::CrosActionModule>()),
+      action_module_(std::make_unique<action::CrosActionModule>(this)),
       assistant_manager_(
           assistant_client::AssistantManager::Create(&platform_api_,
                                                      kDefaultConfigStr)),
       assistant_manager_internal_(
-          UnwrapAssistantManagerInternal(assistant_manager_.get())) {
-  display_connection_.SetAssistantEventObserver(this);
-}
+          UnwrapAssistantManagerInternal(assistant_manager_.get())) {}
 
 AssistantManagerServiceImpl::~AssistantManagerServiceImpl() {}
 
@@ -35,7 +32,6 @@ void AssistantManagerServiceImpl::Start(const std::string& access_token) {
   assistant_manager_internal_->SetOptions(*internal_options, [](bool success) {
     DVLOG(2) << "set options: " << success;
   });
-  assistant_manager_internal_->SetDisplayConnection(&display_connection_);
 
   assistant_manager_internal_->RegisterActionModule(action_module_.get());
 
@@ -75,5 +71,9 @@ void AssistantManagerServiceImpl::OnShowText(const std::string& text) {
   subscribers_.ForAllPtrs([&text](auto* ptr) { ptr->OnTextResponse(text); });
 }
 
+void AssistantManagerServiceImpl::OnOpenUrl(const std::string& url) {
+  subscribers_.ForAllPtrs([&url](auto* ptr) { ptr->OnTextResponse(url); });
+}
+
 }  // namespace assistant
 }  // namespace chromeos

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -10,7 +10,7 @@
 
 // TODO(xiaohuic): replace with "base/macros.h" once we remove
 // libassistant/contrib dependency.
-#include "chromeos/assistant/internal/cros_display_connection.h"
+#include "chromeos/assistant/internal/action/cros_action_module.h"
 #include "chromeos/services/assistant/assistant_manager_service.h"
 #include "chromeos/services/assistant/platform_api_impl.h"
 #include "chromeos/services/assistant/public/mojom/assistant.mojom.h"
@@ -25,13 +25,10 @@ class AssistantManagerInternal;
 namespace chromeos {
 namespace assistant {
 
-namespace action {
-class CrosActionModule;
-}  // namespace action
-
 // Implementation of AssistantManagerService based on libassistant.
-class AssistantManagerServiceImpl : public AssistantManagerService,
-                                    public AssistantEventObserver {
+class AssistantManagerServiceImpl
+    : public AssistantManagerService,
+      public ::chromeos::assistant::action::AssistantActionObserver {
  public:
   AssistantManagerServiceImpl();
   ~AssistantManagerServiceImpl() override;
@@ -46,13 +43,13 @@ class AssistantManagerServiceImpl : public AssistantManagerService,
   void AddAssistantEventSubscriber(
       mojom::AssistantEventSubscriberPtr subscriber) override;
 
-  // AssistantEventObserver overrides:
+  // AssistantActionObserver overrides:
   void OnShowHtml(const std::string& html) override;
-  void OnShowText(const std::string& html) override;
+  void OnShowText(const std::string& text) override;
+  void OnOpenUrl(const std::string& url) override;
 
  private:
   PlatformApiImpl platform_api_;
-  CrosDisplayConnection display_connection_;
   std::unique_ptr<action::CrosActionModule> action_module_;
   std::unique_ptr<assistant_client::AssistantManager> assistant_manager_;
   assistant_client::AssistantManagerInternal* const assistant_manager_internal_;