Commit 27253c26 authored by yilkal's avatar yilkal Committed by Commit Bot

Adds coexistence info screen.

This cl adds an EDU coexistence information screen.
A screenshot of the screen is here: https://drive.google.com/file/d/16DErhvB0RNawBqhfUqMuh9nIz0AgHLYV/view?usp=sharing

Bug: 1082336
Change-Id: Ie02c67142f82c7aa90ba741acd6d7312c34594fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2208087Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Reviewed-by: default avatarAnastasiia N <anastasiian@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770810}
parent cbc5e46d
......@@ -229,6 +229,7 @@
<include name="IDR_EDU_LOGIN_EDU_LOGIN_BUTTON_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_button.js" use_base_dir="false" type="BINDATA" compress="gzip" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_TEMPLATE_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_template.js" use_base_dir="false" type="BINDATA" compress="gzip" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_CSS_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_css.js" use_base_dir="false" type ="BINDATA" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_COEXISTENCE_INFO_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_coexistence_info.js" use_base_dir="false" type ="BINDATA" compress="gzip" preprocess="true" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_PARENTS_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_parents.js" use_base_dir="false" type ="BINDATA" compress="gzip" preprocess="true" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_PARENT_SIGNIN_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_parent_signin.js" use_base_dir="false" type ="BINDATA" compress="gzip" preprocess="true" />
<include name="IDR_EDU_LOGIN_EDU_LOGIN_PARENT_INFO_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\edu_login\edu_login_parent_info.js" use_base_dir="false" type ="BINDATA" compress="gzip" preprocess="true" />
......
......@@ -16,6 +16,7 @@ js_type_check("closure_compile") {
":app",
":browser_proxy",
":edu_login_button",
":edu_login_coexistence_info",
":edu_login_parent_info",
":edu_login_parent_signin",
":edu_login_parents",
......@@ -27,6 +28,7 @@ js_type_check("closure_compile") {
js_library("app") {
deps = [
":edu_login_coexistence_info",
":edu_login_parent_info",
":edu_login_parent_signin",
":edu_login_parents",
......@@ -65,12 +67,11 @@ js_library("browser_proxy") {
js_library("edu_login_util") {
}
js_library("edu_login_welcome") {
js_library("edu_login_coexistence_info") {
deps = [
":edu_login_button",
":edu_login_template",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:i18n_behavior.m",
]
}
......@@ -161,6 +162,12 @@ polymer_modulizer("edu_login_parent_info") {
html_type = "v3-ready"
}
polymer_modulizer("edu_login_coexistence_info") {
js_file = "edu_login_coexistence_info.js"
html_file = "edu_login_coexistence_info.html"
html_type = "v3-ready"
}
polymer_modulizer("edu_login_signin") {
js_file = "edu_login_signin.js"
html_file = "edu_login_signin.html"
......@@ -171,6 +178,7 @@ group("polymer3_elements") {
public_deps = [
":app_module",
":edu_login_button_module",
":edu_login_coexistence_info_module",
":edu_login_css_module",
":edu_login_parent_info_module",
":edu_login_parent_signin_module",
......
......@@ -5,6 +5,8 @@
<edu-login-parent-signin id="[[Steps.PARENT_SIGNIN]]" slot="view"
parent="[[selectedParent_]]" login-params="{{loginParams_}}">
</edu-login-parent-signin>
<edu-login-coexistence-info id="[[Steps.COEXISTENCE_INFO]]" slot="view">
</edu-login-coexistence-info>
<edu-login-parent-info id="[[Steps.PARENT_INFO]]" slot="view">
</edu-login-parent-info>
<edu-login-signin id="[[Steps.EDU_LOGIN]]" slot="view"
......
......@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import './edu_login_coexistence_info.js';
import './edu_login_parents.js';
import './edu_login_parent_signin.js';
import './edu_login_parent_info.js';
......@@ -16,6 +17,7 @@ import {EduLoginParams, ParentAccount} from './edu_login_util.js';
const Steps = {
PARENTS: 'parents',
PARENT_SIGNIN: 'parent-signin',
COEXISTENCE_INFO: 'coexistence-info',
PARENT_INFO: 'parent-info',
EDU_LOGIN: 'edu-login'
};
......
<style include="edu-login-css">
</style>
<edu-login-template>
<span slot="main">
<div class="main-padding">
<if expr="_google_chrome">
<img class="google-full-logo"
src="chrome://theme/IDR_LOGO_GOOGLE_COLOR_90" alt="">
</if>
<h1>$i18n{coexistenceTitle}</h1>
<p class="secondary">$i18nRaw{coexistenceBody}</p>
</div>
</span>
<span slot="buttons">
<edu-login-button button-type="next">
</edu-login-button>
</span>
</edu-login-template>
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import './edu_login_css.js';
import './edu_login_template.js';
import './edu_login_button.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
Polymer({
is: 'edu-login-coexistence-info',
_template: html`{__html_template__}`,
listeners: {
'view-enter-finish': 'viewIsActive_',
},
/**
* Called when current view becomes active. Update the contents to set correct
* scollable classes.
* @private
*/
viewIsActive_() {
this.$$('edu-login-template').updateScrollableContents();
}
});
......@@ -90,6 +90,9 @@ void AddEduStrings(content::WebUIDataSource* source,
base::ASCIIToUTF16(chrome::kClassroomSigninLearnMoreURL)));
source->AddLocalizedString("parentInfoResourcesAvailabilityText",
IDS_EDU_LOGIN_INFO_RESOURCES_AVAILABILITY);
source->AddLocalizedString("coexistenceTitle",
IDS_EDU_LOGIN_COEXISTENCE_TITLE);
source->AddLocalizedString("coexistenceBody", IDS_EDU_LOGIN_COEXISTENCE_BODY);
}
#endif // defined(OS_CHROMEOS)
......@@ -123,6 +126,8 @@ content::WebUIDataSource* CreateWebUIDataSource() {
{"icons.js", IDR_EDU_LOGIN_ICONS_JS},
{"browser_proxy.js", IDR_EDU_LOGIN_BROWSER_PROXY_JS},
{"edu_login_util.js", IDR_EDU_LOGIN_EDU_LOGIN_UTIL_JS},
{"edu_login_coexistence_info.js",
IDR_EDU_LOGIN_EDU_LOGIN_COEXISTENCE_INFO_JS},
{"edu_login_parents.js", IDR_EDU_LOGIN_EDU_LOGIN_PARENTS_JS},
{"edu_login_parent_signin.js", IDR_EDU_LOGIN_EDU_LOGIN_PARENT_SIGNIN_JS},
{"edu_login_parent_info.js", IDR_EDU_LOGIN_EDU_LOGIN_PARENT_INFO_JS},
......
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