Update Welcome App texts based on voice interaction status

The texts of the first step (launcher) of Welcome App should be
customized based on if voice interaction (Assistant) is enabled.

Bug: 750941
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2d53c2e5c8e6e0d579f1564c7793d27fde96d172
Reviewed-on: https://chromium-review.googlesource.com/595111
Commit-Queue: Wenzhao (Colin) Zang <wzang@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491129}

chrome/browser/resources/chromeos/first_run/app_list_step.html

@@ -2,7 +2,7 @@
   <h1 i18n-content="appListHeader"></h1>
   <p>
     <span i18n-content="appListText1"></span><br>
-    <span i18n-content="appListText2"></span>
+    <span id="voice-interaction-text" i18n-content="appListText2" hidden></span>
   </p>
   <div class="controls">
     <button i18n-content="nextButton"

chrome/browser/resources/chromeos/first_run/first_run.js

@@ -222,26 +222,34 @@ cr.define('cr.FirstRun', function() {
 
     /**
      * Shows step with given name in given position.
-     * @param {string} name Name of step.
-     * @param {object} position Optional parameter with optional fields |top|,
-     *     |right|, |bottom|, |left| used for step positioning.
-     * @param {Array} pointWithOffset Optional parameter for positioning
-     *     bubble. Contains [x, y, offset], where (x, y) - point to which bubble
-     *     points, offset - distance between arrow and point.
+     * @param {Object} stepParams Step params dictionary containing:
+     * |name|: Name of the step.
+     * |position|: Optional parameter with optional fields |top|, |right|,
+     *     |bottom|, |left| used for step positioning.
+     * |pointWithOffset|: Optional parameter for positioning bubble. Contains
+     *     [x, y, offset], where (x, y) - point to which bubble points,
+     *     offset - distance between arrow and point.
+     * |voiceInteractionEnabled|: Optional boolean value to indicate if voice
+     *     interaction is enabled by the device.
      */
-    showStep: function(name, position, pointWithOffset) {
+    showStep: function(stepParams) {
       assert(!this.currentStep_);
-      if (!this.steps_.hasOwnProperty(name))
-        throw Error('Step "' + name + '" not found.');
-      var step = this.steps_[name];
-      if (position)
-        step.setPosition(position);
-      if (pointWithOffset)
-        step.setPointsTo(pointWithOffset.slice(0, 2), pointWithOffset[2]);
+      if (!this.steps_.hasOwnProperty(stepParams.name))
+        throw Error('Step "' + stepParams.name + '" not found.');
+      var step = this.steps_[stepParams.name];
+      if (stepParams.position)
+        step.setPosition(stepParams.position);
+      if (stepParams.pointWithOffset) {
+        step.setPointsTo(
+            stepParams.pointWithOffset.slice(0, 2),
+            stepParams.pointWithOffset[2]);
+      }
+      if (stepParams.voiceInteractionEnabled)
+        step.setVoiceInteractionEnabled();
       step.show(true, function(step) {
         step.focusDefaultControl();
         this.currentStep_ = step;
-        chrome.send('stepShown', [name]);
+        chrome.send('stepShown', [stepParams.name]);
       }.bind(this));
     },
 

chrome/browser/resources/chromeos/first_run/step.js

@@ -95,6 +95,14 @@ cr.define('cr.FirstRun', function() {
     focusDefaultControl: function() {
       this.defaultControl_.focus();
     },
+
+    /**
+     * Updates UI when voice interaction is enabled by the device.
+     */
+    setVoiceInteractionEnabled: function() {
+      if (this.name_ == 'app-list')
+        $('voice-interaction-text').hidden = false;
+    },
   };
 
   var Bubble = cr.ui.define('div');

chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
+#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_ui.h"
 
 namespace chromeos {
@@ -43,21 +44,34 @@ void FirstRunHandler::RemoveBackgroundHoles() {
 
 void FirstRunHandler::ShowStepPositioned(const std::string& name,
                                          const StepPosition& position) {
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.FirstRun.showStep", base::Value(name), *position.AsValue());
+  base::DictionaryValue step_params;
+  step_params.SetString("name", name);
+  step_params.Set("position",
+                  base::MakeUnique<base::Value>(*position.AsValue()));
+  step_params.SetList("pointWithOffset", base::MakeUnique<base::ListValue>());
+  step_params.SetBoolean("voiceInteractionEnabled",
+                         chromeos::switches::IsVoiceInteractionEnabled());
+
+  web_ui()->CallJavascriptFunctionUnsafe("cr.FirstRun.showStep", step_params);
 }
 
 void FirstRunHandler::ShowStepPointingTo(const std::string& name,
                                          int x,
                                          int y,
                                          int offset) {
-  auto null = base::MakeUnique<base::Value>();
+  base::DictionaryValue step_params;
+  step_params.SetString("name", name);
+  step_params.Set("position", base::MakeUnique<base::Value>());
   base::ListValue point_with_offset;
   point_with_offset.AppendInteger(x);
   point_with_offset.AppendInteger(y);
   point_with_offset.AppendInteger(offset);
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.FirstRun.showStep", base::Value(name), *null, point_with_offset);
+  step_params.SetList("pointWithOffset",
+                      base::MakeUnique<base::ListValue>(point_with_offset));
+  step_params.SetBoolean("voiceInteractionEnabled",
+                         chromeos::switches::IsVoiceInteractionEnabled());
+
+  web_ui()->CallJavascriptFunctionUnsafe("cr.FirstRun.showStep", step_params);
 }
 
 void FirstRunHandler::HideCurrentStep() {