Commit 4241ec29 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot

[CrOS cellular] Migrate cellular_setup/cellular_setup.js to Polymer3

Fixed: 1111477
Change-Id: I1d26d3063ad38d70dc38177d13a276905c7bd79b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2378000
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802024}
parent 3768ceea
......@@ -244,6 +244,7 @@ if (include_js_tests) {
data += [
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/base_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/button_bar_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/cellular_setup_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/final_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/provisioning_page_test.m.js",
......
......@@ -9,6 +9,7 @@ js_modulizer("modulize") {
input_files = [
"base_page_test.js",
"button_bar_test.js",
"cellular_setup_test.js",
"esim_flow_ui_test.js",
"final_page_test.js",
"provisioning_page_test.js",
......
// 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.
// clang-format off
// #import 'chrome://os-settings/strings.m.js';
// #import 'chrome://resources/cr_components/chromeos/cellular_setup/cellular_setup.m.js';
// #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {assertTrue} from '../../../chai_assert.js';
// clang-format on
suite('CrComponentsCellularSetupTest', function() {
let cellularSetup;
setup(function() {
cellularSetup = document.createElement('cellular-setup');
document.body.appendChild(cellularSetup);
Polymer.dom.flush();
});
test('Base test', function() {
const ironPage = cellularSetup.$$('iron-pages');
assertTrue(!!ironPage);
});
});
......@@ -44,6 +44,7 @@ GEN('#include "content/public/test/browser_test.h"');
[
['BasePage', 'cellular_setup/base_page_test.js', []],
['ButtonBar', 'cellular_setup/button_bar_test.js',[]],
['CellularSetup', 'cellular_setup/cellular_setup_test.js', []],
['EsimFlowUi', 'cellular_setup/esim_flow_ui_test.js',[]],
['FinalPage', 'cellular_setup/final_page_test.js', []],
['ProvisioningPage', 'cellular_setup/provisioning_page_test.js',[]],
......
......@@ -24,6 +24,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
[['BasePage', 'cellular_setup/base_page_test.m.js'],
['ButtonBar', 'cellular_setup/button_bar_test.m.js'],
['CellularSetup', 'cellular_setup/cellular_setup_test.m.js'],
['EsimFlowUi', 'cellular_setup/esim_flow_ui_test.m.js'],
['FinalPage', 'cellular_setup/final_page_test.m.js'],
['ProvisioningPage', 'cellular_setup/provisioning_page_test.m.js'],
......
......@@ -128,8 +128,7 @@ js_type_check("closure_compile_module") {
":base_page.m",
":button_bar.m",
":cellular_types.m",
# ":cellular_setup.m",
":cellular_setup.m",
":esim_flow_ui.m",
":final_page.m",
":mojo_interface_provider.m",
......@@ -137,7 +136,6 @@ js_type_check("closure_compile_module") {
":psim_flow_ui.m",
":sim_detect_page.m",
":subflow_behavior.m",
":setup_selection_flow.m",
":webview_post_util.m",
]
......@@ -261,9 +259,22 @@ js_library("setup_selection_flow.m") {
extra_deps = [ ":setup_selection_flow_module" ]
}
js_library("cellular_setup.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.m.js" ]
deps = [
":button_bar.m",
":cellular_types.m",
":esim_flow_ui.m",
":psim_flow_ui.m",
":setup_selection_flow.m",
"//ui/webui/resources/js:i18n_behavior.m",
]
extra_deps = [ ":cellular_setup_module" ]
}
group("polymer3_elements") {
public_deps = [
":cellular_setup_module",
":base_page_module",
":button_bar_module",
":esim_flow_ui_module",
......@@ -340,6 +351,14 @@ polymer_modulizer("setup_selection_flow") {
auto_imports = cr_components_chromeos_auto_imports
}
polymer_modulizer("cellular_setup") {
js_file = "cellular_setup.js"
html_file = "cellular_setup.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
js_modulizer("modulize") {
input_files = [
"cellular_types.js",
......
......@@ -36,6 +36,5 @@
<button-bar button-state="[[buttonState_]]">
</button-bar>
</template>
<script src="cellular_setup.js">
</script>
<script src="cellular_setup.js"></script>
</dom-module>
......@@ -172,6 +172,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/setup_selection_flow.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_CELLULAR_SETUP_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup.m.js"
use_base_dir="false"
type="BINDATA" />
</if>
<if expr="use_nss_certs">
<include name="IDR_WEBUI_CA_TRUST_EDIT_DIALOG_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