Commit c78786d1 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/network: Migrate NetworkConfig to Polymer 3.

Bug: 1045266
Test: NetworkComponentsNetworkConfigTest*

Change-Id: Ic585489fae7711e483e1759d6dcda5473b43d418
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353557
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804070}
parent 72c29544
...@@ -243,6 +243,7 @@ if (include_js_tests) { ...@@ -243,6 +243,7 @@ if (include_js_tests) {
] ]
if (is_chromeos) { if (is_chromeos) {
data += [ data += [
"$root_gen_dir/chrome/test/data/webui/chromeos/fake_network_config_mojom.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/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/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/cellular_setup_test.m.js",
...@@ -258,6 +259,7 @@ if (include_js_tests) { ...@@ -258,6 +259,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_input_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_input_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_select_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_select_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_toggle_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_toggle_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_ip_config_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_ip_config_test.m.js",
"$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_item_test.m.js", "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_list_item_test.m.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.
import("//third_party/closure_compiler/compile_js.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") {
input_files = [
"fake_network_config_mojom.js",
]
}
js_library("fake_network_config_mojom.m") {
sources = [ "$root_gen_dir/chrome/test/data/webui/chromeos/fake_network_config_mojom.m.js" ]
extra_deps = [ ":modulize" ]
}
...@@ -6,9 +6,15 @@ ...@@ -6,9 +6,15 @@
* @fileoverview Fake implementation of CrosNetworkConfig for testing. * @fileoverview Fake implementation of CrosNetworkConfig for testing.
*/ */
// clang-format off
// #import {assert} from 'chrome://resources/js/assert.m.js';
// #import {OncMojo} from 'chrome://resources/cr_components/chromeos/network/onc_mojo.m.js';
// #import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
// clang-format on
// TODO(stevenjb): Include cros_network_config.mojom.js and extend // TODO(stevenjb): Include cros_network_config.mojom.js and extend
// CrosNetworkConfigInterface // CrosNetworkConfigInterface
class FakeNetworkConfig { /* #export */ class FakeNetworkConfig {
constructor() { constructor() {
/** @private {!Map<string, !PromiseResolver>} */ /** @private {!Map<string, !PromiseResolver>} */
this.resolverMap_ = new Map(); this.resolverMap_ = new Map();
......
...@@ -7,7 +7,8 @@ import("//ui/webui/resources/tools/js_modulizer.gni") ...@@ -7,7 +7,8 @@ import("//ui/webui/resources/tools/js_modulizer.gni")
group("modulize") { group("modulize") {
deps = [ deps = [
"./cellular_setup:modulize", "cellular_setup:modulize",
"./network:modulize", "network:modulize",
"//chrome/test/data/webui/chromeos:modulize",
] ]
} }
...@@ -13,6 +13,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -13,6 +13,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
[['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.m.js'], [['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.m.js'],
['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'], ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
['NetworkApnlist', 'network/network_apnlist_test.m.js'], ['NetworkApnlist', 'network/network_apnlist_test.m.js'],
['NetworkConfig', 'network/network_config_test.m.js'],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'], ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
['NetworkConfigInput', 'network/network_config_input_test.m.js'], ['NetworkConfigInput', 'network/network_config_input_test.m.js'],
['NetworkConfigSelect', 'network/network_config_select_test.m.js'], ['NetworkConfigSelect', 'network/network_config_select_test.m.js'],
......
...@@ -13,6 +13,7 @@ js_modulizer("modulize") { ...@@ -13,6 +13,7 @@ js_modulizer("modulize") {
"network_config_input_test.js", "network_config_input_test.js",
"network_config_select_test.js", "network_config_select_test.js",
"network_config_toggle_test.js", "network_config_toggle_test.js",
"network_config_test.js",
"network_ip_config_test.js", "network_ip_config_test.js",
"network_list_item_test.js", "network_list_item_test.js",
"network_list_test.js", "network_list_test.js",
...@@ -20,4 +21,7 @@ js_modulizer("modulize") { ...@@ -20,4 +21,7 @@ js_modulizer("modulize") {
"network_password_input_test.js", "network_password_input_test.js",
"network_property_list_mojo_test.js", "network_property_list_mojo_test.js",
] ]
namespace_rewrites = [
"network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl",
]
} }
...@@ -2,6 +2,16 @@ ...@@ -2,6 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off
// #import 'chrome://os-settings/strings.m.js';
// #import 'chrome://resources/cr_components/chromeos/network/network_config.m.js';
// #import {FakeNetworkConfig} from 'chrome://test/chromeos/fake_network_config_mojom.m.js';
// #import {MojoInterfaceProviderImpl} from 'chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js';
// #import {OncMojo} from 'chrome://resources/cr_components/chromeos/network/onc_mojo.m.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('network-config', function() { suite('network-config', function() {
var networkConfig; var networkConfig;
...@@ -18,7 +28,7 @@ suite('network-config', function() { ...@@ -18,7 +28,7 @@ suite('network-config', function() {
}); });
function setNetworkConfig(properties) { function setNetworkConfig(properties) {
assert(properties.guid); assertTrue(!!properties.guid);
mojoApi_.setManagedPropertiesForTest(properties); mojoApi_.setManagedPropertiesForTest(properties);
PolymerTest.clearBody(); PolymerTest.clearBody();
networkConfig = document.createElement('network-config'); networkConfig = document.createElement('network-config');
......
...@@ -256,7 +256,7 @@ js_type_check("closure_compile_module") { ...@@ -256,7 +256,7 @@ js_type_check("closure_compile_module") {
":network_apnlist.m", ":network_apnlist.m",
# ":network_choose_mobile.m", # ":network_choose_mobile.m",
# ":network_config.m", ":network_config.m",
":network_config_element_behavior.m", ":network_config_element_behavior.m",
":network_config_input.m", ":network_config_input.m",
":network_config_select.m", ":network_config_select.m",
...@@ -336,7 +336,23 @@ js_library("network_choose_mobile.m") { ...@@ -336,7 +336,23 @@ js_library("network_choose_mobile.m") {
js_library("network_config.m") { js_library("network_config.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_config.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/network/network_config.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":mojo_interface_provider.m",
":network_config_input.m",
":network_config_select.m",
":network_config_toggle.m",
":network_listener_behavior.m",
":network_password_input.m",
":network_shared_css.m",
"//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile",
"//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
"//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
"//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
"//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
] ]
extra_deps = [ ":network_config_module" ] extra_deps = [ ":network_config_module" ]
} }
...@@ -599,6 +615,8 @@ polymer_modulizer("network_config") { ...@@ -599,6 +615,8 @@ polymer_modulizer("network_config") {
js_file = "network_config.js" js_file = "network_config.js"
html_file = "network_config.html" html_file = "network_config.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_config_input") { polymer_modulizer("network_config_input") {
......
<link rel="import" href="../../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="chrome://resources/html/load_time_data.html"> <link rel="import" href="chrome://resources/html/load_time_data.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
<link rel="import" href="mojo_interface_provider.html"> <link rel="import" href="mojo_interface_provider.html">
<link rel="import" href="network_listener_behavior.html"> <link rel="import" href="network_listener_behavior.html">
<link rel="import" href="../../../cr_elements/action_link_css.html"> <link rel="import" href="../../../cr_elements/action_link_css.html">
...@@ -18,6 +17,7 @@ ...@@ -18,6 +17,7 @@
<link rel="import" href="network_config_toggle.html"> <link rel="import" href="network_config_toggle.html">
<link rel="import" href="network_password_input.html"> <link rel="import" href="network_password_input.html">
<link rel="import" href="network_shared_css.html"> <link rel="import" href="network_shared_css.html">
<link rel="import" href="onc_mojo.html">
<dom-module id="network-config"> <dom-module id="network-config">
<template> <template>
......
...@@ -1547,14 +1547,6 @@ Polymer({ ...@@ -1547,14 +1547,6 @@ Polymer({
vpn.l2tp.saveCredentials = this.vpnSaveCredentials_; vpn.l2tp.saveCredentials = this.vpnSaveCredentials_;
}, },
/**
* @return {string}
* @private
*/
getRuntimeError_() {
return (chrome.runtime.lastError && chrome.runtime.lastError.message) || '';
},
/** /**
* @param {boolean} success * @param {boolean} success
* @param {string} errorMessage * @param {string} errorMessage
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<link rel="import" href="cr_policy_network_indicator_mojo.html"> <link rel="import" href="cr_policy_network_indicator_mojo.html">
<link rel="import" href="network_config_element_behavior.html"> <link rel="import" href="network_config_element_behavior.html">
<link rel="import" href="network_shared_css.html"> <link rel="import" href="network_shared_css.html">
<link rel="import" href="onc_mojo.html">
<dom-module id="network-config-select"> <dom-module id="network-config-select">
<template> <template>
......
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
cr_components_chromeos_namespace_rewrites = [ cr_components_chromeos_namespace_rewrites = [
"network_config.MojoInterfaceProvider|MojoInterfaceProvider", "action_link.m.js|action_link.js",
"settings.receivedEventFromKeyboard|receivedEventFromKeyboard",
"settings.LockScreenProgress|LockScreenProgress",
"cellular_setup.MojoInterfaceProvider|MojoInterfaceProvider",
"webviewPost.util.postDeviceDataToWebview|postDeviceDataToWebview",
"cellularSetup.ButtonState|ButtonState", "cellularSetup.ButtonState|ButtonState",
"cellularSetup.Button|Button", "cellularSetup.Button|Button",
"cellularSetup.ButtonBarState|ButtonBarState", "cellularSetup.ButtonBarState|ButtonBarState",
...@@ -17,6 +13,11 @@ cr_components_chromeos_namespace_rewrites = [ ...@@ -17,6 +13,11 @@ cr_components_chromeos_namespace_rewrites = [
"cellularSetup.PSimPageName|PSimPageName", "cellularSetup.PSimPageName|PSimPageName",
"cellularSetup.PSimUIState|PSimUIState", "cellularSetup.PSimUIState|PSimUIState",
"cellularSetup.getTimeoutMsForPSimUIState|getTimeoutMsForPSimUIState", "cellularSetup.getTimeoutMsForPSimUIState|getTimeoutMsForPSimUIState",
"cellular_setup.MojoInterfaceProvider|MojoInterfaceProvider",
"network_config.MojoInterfaceProvider|MojoInterfaceProvider",
"settings.LockScreenProgress|LockScreenProgress",
"settings.receivedEventFromKeyboard|receivedEventFromKeyboard",
"webviewPost.util.postDeviceDataToWebview|postDeviceDataToWebview",
] ]
cr_components_chromeos_auto_imports = [ cr_components_chromeos_auto_imports = [
...@@ -32,4 +33,5 @@ cr_components_chromeos_auto_imports = [ ...@@ -32,4 +33,5 @@ cr_components_chromeos_auto_imports = [
"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/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",
"ui/webui/resources/html/polymer.html|Polymer,flush,html",
] ]
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_INPUT_M_JS" <include name="IDR_WEBUI_CHROMEOS_NETWORK_CONFIG_INPUT_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_input.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/network/network_config_input.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