Skip to content

GitLab

T
tangled
Commit cc3bccc4 authored by Renato Silva's avatar Renato Silva Committed by Chromium LUCI CQ
Browse files
Options

OOBE - Migrate Assistant off HTML imports 

Google Assistant is usually configured during OOBE. When the
user skips voice match during OOBE, an in-session UI is used
to train the system to recognize the user's voice.

Migrate Google Assistant in-session UI off HTML imports by
using the HTML Imports polyfill. This polyfill is currently
also being used for the whole OOBE.

Tested on a Pixelbook.

Bug: 1111849
Change-Id: I237fbb2bec88bf265610edbc6b0ed13b9bc54be9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632683Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Renato Silva <rrsilva@google.com>
Cr-Commit-Position: refs/heads/master@{#844736}
parent 4ce98883
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
chrome/browser/resources/chromeos/assistant_optin/assistant_optin.html
View file @ cc3bccc4
......@@ -7,6 +7,7 @@
<head>
<meta charset="utf-8">
<script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js"></script>
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/cr.html">
......
chrome/browser/resources/chromeos/assistant_optin/assistant_optin.js
View file @ cc3bccc4
......@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
HTMLImports.whenReady(() => {
// <include src="../login/components/multi_step_behavior.js">
// <include src="../login/components/oobe_types.js">
// <include src="../login/components/oobe_buttons.js">
......@@ -64,6 +65,12 @@ cr.define('login.AssistantOptInFlowScreen', function() {
};
});
document.addEventListener('DOMContentLoaded', function() {
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', function() {
login.AssistantOptInFlowScreen.show();
});
} else {
login.AssistantOptInFlowScreen.show();
});
}
});
\ No newline at end of file
chrome/renderer/chrome_content_renderer_client.cc
View file @ cc3bccc4
......@@ -1650,8 +1650,6 @@ bool ChromeContentRendererClient::RequiresHtmlImports(const GURL& url) {
host_piece == chrome::kChromeUIAccountMigrationWelcomeHost ||
// TODO(crbug.com/1111430): Remove when migrated to Polymer3.
host_piece == chrome::kChromeUIAddSupervisionHost ||
// TODO(crbug.com/1111849): Remove when migrated to Polymer3.
host_piece == chrome::kChromeUIAssistantOptInHost ||
// TODO(crbug.com/1111477): Remove when migrated to Polymer3.
host_piece == chrome::kChromeUICellularSetupHost ||
// TODO(crbug.com/1090884): Remove when migrated to Polymer3.
......
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