Commit 3677ecbf authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/network: Convert NetworkSelect to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: NetworkComponentsNetworkSelectTest*
Change-Id: I7b10ffe2e7080941bddc5adeee3bb65e18fb0463
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404071
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806307}
parent feb68996
...@@ -268,6 +268,7 @@ if (include_js_tests) { ...@@ -268,6 +268,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_nameservers_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_nameservers_test.m.js",
"$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_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_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_elements/cr_searchable_drop_down_tests.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/ambient_mode_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",
......
...@@ -45,6 +45,10 @@ GEN('#include "content/public/test/browser_test.h"'); ...@@ -45,6 +45,10 @@ GEN('#include "content/public/test/browser_test.h"');
['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.js', []], ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.js', []],
].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test)); ].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test));
[
['NetworkSelect', 'network/network_select_test.js', []],
].forEach(test => registerTest('NetworkComponents', 'network', ...test));
[ [
['BasePage', 'cellular_setup/base_page_test.js', []], ['BasePage', 'cellular_setup/base_page_test.js', []],
['ButtonBar', 'cellular_setup/button_bar_test.js',[]], ['ButtonBar', 'cellular_setup/button_bar_test.js',[]],
......
...@@ -25,6 +25,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -25,6 +25,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
['NetworkNameservers', 'network/network_nameservers_test.m.js'], ['NetworkNameservers', 'network/network_nameservers_test.m.js'],
['NetworkPasswordInput', 'network/network_password_input_test.m.js'], ['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.m.js'], ['NetworkPropertyListMojo', 'network/network_property_list_mojo_test.m.js'],
['NetworkSelect', 'network/network_select_test.m.js'],
].forEach(test => registerTest('NetworkComponents', ...test)); ].forEach(test => registerTest('NetworkComponents', ...test));
[['BasePage', 'cellular_setup/base_page_test.m.js'], [['BasePage', 'cellular_setup/base_page_test.m.js'],
......
...@@ -21,6 +21,7 @@ js_modulizer("modulize") { ...@@ -21,6 +21,7 @@ js_modulizer("modulize") {
"network_nameservers_test.js", "network_nameservers_test.js",
"network_password_input_test.js", "network_password_input_test.js",
"network_property_list_mojo_test.js", "network_property_list_mojo_test.js",
"network_select_test.js",
] ]
namespace_rewrites = [ namespace_rewrites = [
"network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl", "network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl",
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
// #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js'; // #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
// clang-format on // clang-format on
suite('NetworkNetworkListTest', function() { suite('NetworkListTest', function() {
/** @type {!NetworkList|undefined} */ /** @type {!NetworkList|undefined} */
let networkList; let networkList;
......
// 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://resources/cr_components/chromeos/network/network_select.m.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('NetworkSelectTest', function() {
/** @type {!NetworkSelect|undefined} */
let networkSelect;
setup(function() {
networkSelect = document.createElement('network-select');
document.body.appendChild(networkSelect);
Polymer.dom.flush();
});
test('Scan progress visibility', function() {
// Scan progress is not shown by default.
let paperProgress = networkSelect.$$('paper-progress');
assertEquals(null, paperProgress);
assertFalse(networkSelect.showScanProgress);
networkSelect.showScanProgress = true;
Polymer.dom.flush();
paperProgress = networkSelect.$$('paper-progress');
assertTrue(!!paperProgress);
});
});
...@@ -275,7 +275,7 @@ js_type_check("closure_compile_module") { ...@@ -275,7 +275,7 @@ js_type_check("closure_compile_module") {
# ":network_proxy.m", # ":network_proxy.m",
# ":network_proxy_exclusions.m", # ":network_proxy_exclusions.m",
# ":network_proxy_input.m", # ":network_proxy_input.m",
# ":network_select.m", ":network_select.m",
":network_shared_css.m", ":network_shared_css.m",
# ":network_siminfo.m", # ":network_siminfo.m",
":onc_mojo.m", ":onc_mojo.m",
...@@ -535,7 +535,11 @@ js_library("network_proxy_input.m") { ...@@ -535,7 +535,11 @@ js_library("network_proxy_input.m") {
js_library("network_select.m") { js_library("network_select.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_select.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_select.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":network_list.m",
":network_listener_behavior.m",
":onc_mojo.m",
"//third_party/polymer/v3_0/components-chromium/paper-progress:paper-progress",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
] ]
extra_deps = [ ":network_select_module" ] extra_deps = [ ":network_select_module" ]
} }
...@@ -724,6 +728,8 @@ polymer_modulizer("network_select") { ...@@ -724,6 +728,8 @@ polymer_modulizer("network_select") {
js_file = "network_select.js" js_file = "network_select.js"
html_file = "network_select.html" html_file = "network_select.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = cr_components_chromeos_auto_imports
namespace_rewrites = cr_components_chromeos_namespace_rewrites
} }
polymer_modulizer("network_shared_css") { polymer_modulizer("network_shared_css") {
......
<link rel="import" href="../../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<link rel="import" href="mojo_interface_provider.html">
<link rel="import" href="network_list.html"> <link rel="import" href="network_list.html">
<link rel="import" href="network_listener_behavior.html"> <link rel="import" href="network_listener_behavior.html">
<link rel="import" href="onc_mojo.html"> <link rel="import" href="onc_mojo.html">
<link rel="import" href="../../../cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<dom-module id="network-select"> <dom-module id="network-select">
<template> <template>
......
...@@ -108,6 +108,10 @@ ...@@ -108,6 +108,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_property_list_mojo.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_SELECT_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_select.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_SHARED_CSS_M_JS" <include name="IDR_WEBUI_CHROMEOS_NETWORK_SHARED_CSS_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_shared_css.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_shared_css.m.js"
use_base_dir="false" 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