Register action module

Change-Id: I707c135fe9d7e7c18fb881f617c432a24584959e
Reviewed-on: https://chromium-review.googlesource.com/956084
Commit-Queue: Alan Lau <alanlau@google.com>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541942}

chromeos/services/assistant/BUILD.gn

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

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -7,6 +7,7 @@
 #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"
@@ -16,6 +17,7 @@ namespace assistant {
 
 AssistantManagerServiceImpl::AssistantManagerServiceImpl()
     : platform_api_(kDefaultConfigStr),
+      action_module_(std::make_unique<action::CrosActionModule>()),
       assistant_manager_(
           assistant_client::AssistantManager::Create(&platform_api_,
                                                      kDefaultConfigStr)),
@@ -35,6 +37,8 @@ void AssistantManagerServiceImpl::Start(const std::string& access_token) {
   });
   assistant_manager_internal_->SetDisplayConnection(&display_connection_);
 
+  assistant_manager_internal_->RegisterActionModule(action_module_.get());
+
   SetAccessToken(access_token);
   assistant_manager_->Start();
 }

chromeos/services/assistant/assistant_manager_service_impl.h

@@ -25,6 +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 {
@@ -49,6 +53,7 @@ class AssistantManagerServiceImpl : public AssistantManagerService,
  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_;
   mojo::InterfacePtrSet<mojom::AssistantEventSubscriber> subscribers_;