Commit 4e4205d2 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot

[CrOS settings] Migrate cellular_setup/button_bar.js page

Change-Id: I0db4c44289b25d2224acf576dde9e77e8767dc5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359024Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/master@{#801190}
parent 9b07681c
...@@ -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/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/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/cellular_setup/provisioning_page_test.m.js",
......
...@@ -7,6 +7,7 @@ import("//ui/webui/resources/tools/js_modulizer.gni") ...@@ -7,6 +7,7 @@ import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [
"base_page_test.js", "base_page_test.js",
"button_bar_test.js",
"final_page_test.js", "final_page_test.js",
"sim_detect_page_test.js", "sim_detect_page_test.js",
"provisioning_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/button_bar.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('CellularSetupButtonBarTest', function() {
let buttonBar;
setup(function() {
buttonBar = document.createElement('button-bar');
document.body.appendChild(buttonBar);
Polymer.dom.flush();
});
test('Base test', function() {
const title = buttonBar.$$('cr-button');
assertTrue(!!title);
});
});
...@@ -43,6 +43,7 @@ GEN('#include "content/public/test/browser_test.h"'); ...@@ -43,6 +43,7 @@ GEN('#include "content/public/test/browser_test.h"');
[ [
['BasePage', 'cellular_setup/base_page_test.js', []], ['BasePage', 'cellular_setup/base_page_test.js', []],
['ButtonBar', 'cellular_setup/button_bar_test.js',[]],
['FinalPage', 'cellular_setup/final_page_test.js', []], ['FinalPage', 'cellular_setup/final_page_test.js', []],
['ProvisioningPage', 'cellular_setup/provisioning_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', []],
......
...@@ -23,6 +23,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -23,6 +23,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
].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'],
['ButtonBar', 'cellular_setup/button_bar_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'], ['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'],
......
...@@ -88,8 +88,8 @@ js_type_check("closure_compile_module") { ...@@ -88,8 +88,8 @@ js_type_check("closure_compile_module") {
is_polymer3 = true is_polymer3 = true
deps = [ deps = [
":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",
...@@ -160,9 +160,19 @@ js_library("provisioning_page.m") { ...@@ -160,9 +160,19 @@ js_library("provisioning_page.m") {
] ]
} }
js_library("button_bar.m") {
sources = [ "$root_gen_dir/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.m.js" ]
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:i18n_behavior.m",
]
extra_deps = [ ":button_bar_module" ]
}
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ public_deps = [
":base_page_module", ":base_page_module",
":button_bar_module",
":final_page_module", ":final_page_module",
":modulize", ":modulize",
":provisioning_page_module", ":provisioning_page_module",
...@@ -186,6 +196,14 @@ polymer_modulizer("final_page") { ...@@ -186,6 +196,14 @@ polymer_modulizer("final_page") {
auto_imports = cr_components_chromeos_auto_imports auto_imports = cr_components_chromeos_auto_imports
} }
polymer_modulizer("button_bar") {
js_file = "button_bar.js"
html_file = "button_bar.html"
html_type = "dom-module"
namespace_rewrites = cr_components_chromeos_namespace_rewrites
auto_imports = cr_components_chromeos_auto_imports
}
polymer_modulizer("sim_detect_page") { polymer_modulizer("sim_detect_page") {
js_file = "sim_detect_page.js" js_file = "sim_detect_page.js"
html_file = "sim_detect_page.html" html_file = "sim_detect_page.html"
......
...@@ -148,6 +148,10 @@ ...@@ -148,6 +148,10 @@
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.m.js" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/provisioning_page.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_WEBUI_CHROMEOS_CELLULAR_SETUP_BUTTON_BAR_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.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