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

OS Settings: Convert NetworkSummary to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: OSSettingsNetworkSummary*
Change-Id: I7829685316e5f9cf52e20296a0d73f66ef5cc2ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432081
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811294}
parent e899de02
......@@ -202,7 +202,7 @@ js_type_check("closure_compile_module") {
":internet_shared_css.m",
# ":internet_subpage.m",
":network_proxy_section.m",
# ":network_summary.m",
":network_summary.m",
":network_summary_item.m",
# ":tether_connection_dialog.m"
]
......@@ -328,7 +328,11 @@ js_library("network_proxy_section.m") {
js_library("network_summary.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_summary.m.js" ]
deps = [
# TODO: Fill those in.
":network_summary_item.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
"//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
]
extra_deps = [ ":network_summary_module" ]
}
......@@ -429,6 +433,8 @@ polymer_modulizer("network_summary") {
js_file = "network_summary.js"
html_file = "network_summary.html"
html_type = "dom-module"
auto_imports = os_settings_auto_imports
namespace_rewrites = os_settings_namespace_rewrites
}
polymer_modulizer("network_summary_item") {
......
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/network/mojo_interface_provider.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/network/network_listener_behavior.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
<link rel="import" href="network_summary_item.html">
......
......@@ -11,6 +11,7 @@ import './internet_page/cellular_setup_dialog.m.js';
import './internet_page/internet_config.m.js';
import './internet_page/internet_known_networks_page.m.js';
import './internet_page/network_proxy_section.m.js';
import './internet_page/network_summary.m.js';
import './internet_page/network_summary_item.m.js';
import './nearby_share_page/nearby_share_receive_dialog.m.js';
import './nearby_share_page/nearby_share_subpage.m.js';
......
......@@ -65,6 +65,11 @@
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NETWORK_SUMMARY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_summary.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NETWORK_SUMMARY_ITEM_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.m.js"
use_base_dir="false"
......
......@@ -304,6 +304,7 @@ if (include_js_tests) {
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/nearby_share_subpage_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/network_proxy_section_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/network_summary_item_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/network_summary_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_edit_dictionary_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_languages_page_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_languages_page_v2_tests.m.js",
......
......@@ -54,6 +54,7 @@ js_modulizer("modulize") {
"nearby_share_receive_dialog_tests.js",
"nearby_share_subpage_tests.js",
"network_proxy_section_test.js",
"network_summary_test.js",
"network_summary_item_test.js",
"os_edit_dictionary_page_test.js",
"os_languages_page_tests.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/chromeos/os_settings.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// clang-format on
suite('NetworkSummary', function() {
/** @type {!NetworkSummaryElement|undefined} */
let netSummary;
setup(function() {
netSummary = document.createElement('network-summary');
document.body.appendChild(netSummary);
Polymer.dom.flush();
});
test('Default network summary item', function() {
const summaryItems =
netSummary.shadowRoot.querySelectorAll('network-summary-item');
assertEquals(1, summaryItems.length);
assertEquals('WiFi', summaryItems[0].id);
});
});
......@@ -1202,6 +1202,20 @@ TEST_F('OSSettingsNetworkSummaryItemTest', 'All', () => {
mocha.run();
});
// eslint-disable-next-line no-var
var OSSettingsNetworkSummaryTest = class extends OSSettingsBrowserTest {
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
'network_summary_test.js',
]);
}
};
TEST_F('OSSettingsNetworkSummaryTest', 'All', () => {
mocha.run();
});
// eslint-disable-next-line no-var
var OSSettingsPeoplePageAccountManagerTest =
class extends OSSettingsBrowserTest {
......
......@@ -105,6 +105,7 @@ TEST_F('OSSettingsNearbyShareSubPageV3Test', 'All', () => mocha.run());
['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],
['MultideviceSubPage', 'multidevice_subpage_tests.m.js'],
['NetworkProxySection', 'network_proxy_section_test.m.js'],
['NetworkSummary', 'network_summary_test.m.js'],
['NetworkSummaryItem', 'network_summary_item_test.m.js'],
['OsEditDictionaryPage', 'os_edit_dictionary_page_test.m.js'],
['OsLanguagesPage', 'os_languages_page_tests.m.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