Commit 6484f314 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/network: Convert NetworkSiminfo to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: NetworkComponentsNetworkSelectTest*
Change-Id: I3ed349337f3798aa3d1ee92063ed9c6a8d0ce3bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405643
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806338}
parent 3cd0223f
......@@ -269,6 +269,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_password_input_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_property_list_mojo_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_select_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_siminfo_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/ambient_mode_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",
......
......@@ -43,6 +43,7 @@ GEN('#include "content/public/test/browser_test.h"');
['NetworkNameservers', 'network/network_nameservers_test.js', []],
['NetworkPasswordInput', 'network/network_password_input_test.js', []],
['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.js', []],
['NetworkSiminfo', 'network/network_siminfo_test.js', []],
].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test));
[
......
......@@ -26,6 +26,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.m.js'],
['NetworkSelect', 'network/network_select_test.m.js'],
['NetworkSiminfo', 'network/network_siminfo_test.m.js'],
].forEach(test => registerTest('NetworkComponents', ...test));
[['BasePage', 'cellular_setup/base_page_test.m.js'],
......
......@@ -22,6 +22,7 @@ js_modulizer("modulize") {
"network_password_input_test.js",
"network_property_list_mojo_test.js",
"network_select_test.js",
"network_siminfo_test.js",
]
namespace_rewrites = [
"network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl",
......
// 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/network/network_siminfo.m.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('NetworkSiminfoTest', function() {
/** @type {!NetworkSiminfo|undefined} */
let simInfo;
setup(function() {
simInfo = document.createElement('network-simInfo');
document.body.appendChild(simInfo);
Polymer.dom.flush();
});
test('Show SIM missing', function() {
// SIM missing UI is dependent on the device state being set.
let simMissingGroup = simInfo.$$('#simMissing');
assertTrue(simMissingGroup.hidden);
// SIM lock status is not set on the device state, so the SIM is considered
// missing.
simInfo.deviceState = {};
Polymer.dom.flush();
assertFalse(simMissingGroup.hidden);
// SIM lock status is set, so the SIM is not considered missing.
simInfo.deviceState = {
simLockStatus: {}
};
Polymer.dom.flush();
assertTrue(simMissingGroup.hidden);
});
});
......@@ -277,7 +277,7 @@ js_type_check("closure_compile_module") {
# ":network_proxy_input.m",
":network_select.m",
":network_shared_css.m",
# ":network_siminfo.m",
":network_siminfo.m",
":onc_mojo.m",
]
}
......@@ -555,7 +555,19 @@ js_library("network_shared_css.m") {
js_library("network_siminfo.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_siminfo.m.js" ]
deps = [
# TODO: Fill those in.
":mojo_interface_provider.m",
":network_password_input.m",
":network_shared_css.m",
":onc_mojo.m",
"//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
"//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button.m",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
"//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js/cr/ui:focus_without_ink.m",
]
extra_deps = [ ":network_siminfo_module" ]
}
......@@ -742,6 +754,8 @@ polymer_modulizer("network_siminfo") {
js_file = "network_siminfo.js"
html_file = "network_siminfo.html"
html_type = "dom-module"
auto_imports = cr_components_chromeos_auto_imports
namespace_rewrites = cr_components_chromeos_namespace_rewrites
}
import("//ui/webui/resources/tools/js_modulizer.gni")
......
<link rel="import" href="../../../html/polymer.html">
<link rel="import" href="onc_mojo.html">
<link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
<link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="../../../cr_elements/cr_toggle/cr_toggle.html">
......@@ -10,8 +9,10 @@
<link rel="import" href="../../../html/i18n_behavior.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-icon/iron-icon.html">
<link rel="import" href="mojo_interface_provider.html">
<link rel="import" href="network_password_input.html">
<link rel="import" href="network_shared_css.html">
<link rel="import" href="onc_mojo.html">
<dom-module id="network-siminfo">
<template>
......@@ -50,7 +51,7 @@
</style>
<!-- SIM missing UI -->
<div class="property-box two-line"
<div id="simMissing" class="property-box two-line"
hidden$="[[!showSimMissing_(deviceState)]]">
<div class="start layout horizontal center">
<iron-icon icon="cr:sim-card-alert"></iron-icon>
......
......@@ -116,6 +116,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_shared_css.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_SIMINFO_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_siminfo.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_ONC_MOJOM_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/onc_mojo.m.js"
use_base_dir="false"
......
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