Commit 0c4572c2 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot

[CrOS settings] Migrate cellular_setup/provisioning_page to Polymer3

Change-Id: Ia276e9af51540df765527977105ff2366eecf878
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359751
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801101}
parent 8eb0e149
...@@ -245,6 +245,7 @@ if (include_js_tests) { ...@@ -245,6 +245,7 @@ if (include_js_tests) {
"$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/base_page_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/final_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/sim_detect_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/sim_detect_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/provisioning_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.m.js",
......
...@@ -9,5 +9,6 @@ js_modulizer("modulize") { ...@@ -9,5 +9,6 @@ js_modulizer("modulize") {
"base_page_test.js", "base_page_test.js",
"final_page_test.js", "final_page_test.js",
"sim_detect_page_test.js", "sim_detect_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/provisioning_page.m.js';
// #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {assertFalse, assertTrue} from '../../../chai_assert.js';
// clang-format on
suite('CrComponentsProvisioningPageTest', function() {
let provisioningPage;
setup(function() {
provisioningPage = document.createElement('provisioning-page');
document.body.appendChild(provisioningPage);
Polymer.dom.flush();
});
test('Base test', function() {
const basePage = provisioningPage.$$('base-page');
assertTrue(!!basePage);
});
});
...@@ -44,6 +44,7 @@ GEN('#include "content/public/test/browser_test.h"'); ...@@ -44,6 +44,7 @@ GEN('#include "content/public/test/browser_test.h"');
[ [
['BasePage', 'cellular_setup/base_page_test.js', []], ['BasePage', 'cellular_setup/base_page_test.js', []],
['FinalPage', 'cellular_setup/final_page_test.js', []], ['FinalPage', 'cellular_setup/final_page_test.js', []],
['ProvisioningPage', 'cellular_setup/provisioning_page_test.js',[]],
['SimDetectPage', 'cellular_setup/sim_detect_page_test.js', []], ['SimDetectPage', 'cellular_setup/sim_detect_page_test.js', []],
].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test)); ].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));
// clang-format on // clang-format on
......
...@@ -24,6 +24,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -24,6 +24,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
[['BasePage', 'cellular_setup/base_page_test.m.js'], [['BasePage', 'cellular_setup/base_page_test.m.js'],
['FinalPage', 'cellular_setup/final_page_test.m.js'], ['FinalPage', 'cellular_setup/final_page_test.m.js'],
['ProvisioningPage', 'cellular_setup/provisioning_page_test.m.js'],
['SimDetectPage', 'cellular_setup/sim_detect_page_test.m.js'], ['SimDetectPage', 'cellular_setup/sim_detect_page_test.m.js'],
].forEach(test => registerTest('CellularSetup', ...test)); ].forEach(test => registerTest('CellularSetup', ...test));
// clang-format on // clang-format on
...@@ -51,6 +52,7 @@ function registerTest(componentName, testName, module, caseName) { ...@@ -51,6 +52,7 @@ function registerTest(componentName, testName, module, caseName) {
return { return {
enabled: [ enabled: [
'chromeos::features::kOsSettingsPolymer3', 'chromeos::features::kOsSettingsPolymer3',
'chromeos::features::kUpdatedCellularActivationUi',
], ],
}; };
} }
......
...@@ -87,15 +87,14 @@ js_library("mojo_interface_provider") { ...@@ -87,15 +87,14 @@ js_library("mojo_interface_provider") {
js_type_check("closure_compile_module") { js_type_check("closure_compile_module") {
is_polymer3 = true is_polymer3 = true
deps = [ deps = [
# ":button_bar.m",
":base_page.m", ":base_page.m",
# ":button_bar.m", # ":button_bar.m",
# ":cellular_setup.m", # ":cellular_setup.m",
":final_page.m", ":final_page.m",
":mojo_interface_provider.m", ":mojo_interface_provider.m",
":provisioning_page.m",
# ":provisioning_page.m",
# ":psim_flow_ui.m", # ":psim_flow_ui.m",
":sim_detect_page.m", ":sim_detect_page.m",
":webview_post_util.m", ":webview_post_util.m",
...@@ -141,18 +140,33 @@ js_library("webview_post_util.m") { ...@@ -141,18 +140,33 @@ js_library("webview_post_util.m") {
js_library("sim_detect_page.m") { js_library("sim_detect_page.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js" ]
deps = [ ":base_page.m" ]
extra_deps = [ ":sim_detect_page_module" ]
}
js_library("provisioning_page.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.m.js" ]
deps = [ deps = [
":base_page.m", ":base_page.m",
":webview_post_util.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:i18n_behavior.m",
]
extra_deps = [ ":provisioning_page_module" ]
externs_list = [
"$externs_path/chrome_extensions.js",
"$externs_path/webview_tag.js",
] ]
extra_deps = [ ":sim_detect_page_module" ]
} }
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ public_deps = [
":base_page_module", ":base_page_module",
":final_page_module", ":final_page_module",
":sim_detect_page_module",
":modulize", ":modulize",
":provisioning_page_module",
":sim_detect_page_module",
] ]
} }
...@@ -180,6 +194,14 @@ polymer_modulizer("sim_detect_page") { ...@@ -180,6 +194,14 @@ polymer_modulizer("sim_detect_page") {
auto_imports = cr_components_chromeos_auto_imports auto_imports = cr_components_chromeos_auto_imports
} }
polymer_modulizer("provisioning_page") {
js_file = "provisioning_page.js"
html_file = "provisioning_page.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [
"mojo_interface_provider.js", "mojo_interface_provider.js",
......
<link rel="import" href="../../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="../../../html/i18n_behavior.html">
<link rel="import" href="base_page.html"> <link rel="import" href="base_page.html">
<link rel="import" href="webview_post_util.html"> <link rel="import" href="webview_post_util.html">
<link rel="import" href="../../../html/i18n_behavior.html">
<link rel="import" href="../../../html/load_time_data.html">
<link rel="import" href="../../../html/assert.html">
<link rel="import" href="../../../cr_elements/hidden_style_css.html"> <link rel="import" href="../../../cr_elements/hidden_style_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
......
...@@ -9,6 +9,7 @@ cr_components_chromeos_namespace_rewrites = [ ...@@ -9,6 +9,7 @@ cr_components_chromeos_namespace_rewrites = [
"settings.receivedEventFromKeyboard|receivedEventFromKeyboard", "settings.receivedEventFromKeyboard|receivedEventFromKeyboard",
"settings.LockScreenProgress|LockScreenProgress", "settings.LockScreenProgress|LockScreenProgress",
"cellular_setup.MojoInterfaceProvider|MojoInterfaceProvider", "cellular_setup.MojoInterfaceProvider|MojoInterfaceProvider",
"webviewPost.util.postDeviceDataToWebview|postDeviceDataToWebview",
] ]
cr_components_chromeos_auto_imports = [ cr_components_chromeos_auto_imports = [
...@@ -18,5 +19,6 @@ cr_components_chromeos_auto_imports = [ ...@@ -18,5 +19,6 @@ cr_components_chromeos_auto_imports = [
"ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior", "ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior",
"ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html|MojoInterfaceProviderImpl,MojoInterfaceProvider", "ui/webui/resources/cr_components/chromeos/network/mojo_interface_provider.html|MojoInterfaceProviderImpl,MojoInterfaceProvider",
"ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html|recordLockScreenProgress,LockScreenProgress", "ui/webui/resources/cr_components/chromeos/quick_unlock/lock_screen_constants.html|recordLockScreenProgress,LockScreenProgress",
"ui/webui/resources/cr_components/chromeos/cellular_setup/webview_post_util.html|postDeviceDataToWebview",
"ui/webui/resources/html/assert.html|assert,assertNotReached", "ui/webui/resources/html/assert.html|assert,assertNotReached",
] ]
...@@ -144,6 +144,10 @@ ...@@ -144,6 +144,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/sim_detect_page.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_PROVISIONING_PAGE_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.m.js"
use_base_dir="false"
type="BINDATA" />
</if> </if>
<if expr="use_nss_certs"> <if expr="use_nss_certs">
<include name="IDR_WEBUI_CA_TRUST_EDIT_DIALOG_JS" <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