Commit a3d37b5f authored by rbpotter's avatar rbpotter Committed by Commit Bot

Settings: Port on_startup_page/* to Polymer 3

- Autogenerate Polymer 3 versions for files in on_startup_page/*
- Update closure compiler and polymer_modulizer/js_modulizer targets
  for these files
- Autogenerate tests for the Polymer 3 files

Bug: 1026426
Change-Id: I122bcb77d366b7fc7fd979b235d13d283faf8d43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040626
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739259}
parent f3e76291
...@@ -212,6 +212,7 @@ group("closure_compile_module") { ...@@ -212,6 +212,7 @@ group("closure_compile_module") {
deps = [ deps = [
":closure_compile_local_module", ":closure_compile_local_module",
"controls:closure_compile_module", "controls:closure_compile_module",
"on_startup_page:closure_compile_module",
"prefs:closure_compile_module", "prefs:closure_compile_module",
"search_engines_page:closure_compile_module", "search_engines_page:closure_compile_module",
"search_page:closure_compile_module", "search_page:closure_compile_module",
......
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
import("../settings.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
":on_startup_browser_proxy", ":on_startup_browser_proxy",
":on_startup_page", ":on_startup_page",
":startup_url_dialog",
":startup_url_entry", ":startup_url_entry",
":startup_urls_page", ":startup_urls_page",
":startup_urls_page_browser_proxy", ":startup_urls_page_browser_proxy",
...@@ -60,31 +64,38 @@ js_library("startup_url_entry") { ...@@ -60,31 +64,38 @@ js_library("startup_url_entry") {
] ]
} }
# TODO(crbug.com/1026426): Fix and enable. js_library("startup_url_dialog") {
#js_type_check("closure_compile_module") { deps = [
# is_polymer3 = true ":startup_urls_page_browser_proxy",
# deps = [ "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
# ":on_startup_browser_proxy.m", "//ui/webui/resources/js:cr",
# ":on_startup_page.m", "//ui/webui/resources/js:load_time_data",
# ":startup_url_dialog.m", ]
# ":startup_url_entry.m", }
# ":startup_urls_page.m",
# ":startup_urls_page_browser_proxy.m",
# ]
#}
js_library("on_startup_browser_proxy.m") { js_type_check("closure_compile_module") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js" ] is_polymer3 = true
deps = [ deps = [
# TODO: Fill those in. ":on_startup_browser_proxy.m",
":on_startup_page.m",
":startup_url_dialog.m",
":startup_url_entry.m",
":startup_urls_page.m",
":startup_urls_page_browser_proxy.m",
] ]
}
js_library("on_startup_browser_proxy.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js" ]
deps = [ "//ui/webui/resources/js:cr.m" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize" ]
} }
js_library("on_startup_page.m") { js_library("on_startup_page.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":on_startup_browser_proxy.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
] ]
extra_deps = [ ":on_startup_page_module" ] extra_deps = [ ":on_startup_page_module" ]
} }
...@@ -92,7 +103,9 @@ js_library("on_startup_page.m") { ...@@ -92,7 +103,9 @@ js_library("on_startup_page.m") {
js_library("startup_url_dialog.m") { js_library("startup_url_dialog.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":startup_urls_page_browser_proxy.m",
"..:i18n_setup.m",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
] ]
extra_deps = [ ":startup_url_dialog_module" ] extra_deps = [ ":startup_url_dialog_module" ]
} }
...@@ -100,7 +113,12 @@ js_library("startup_url_dialog.m") { ...@@ -100,7 +113,12 @@ js_library("startup_url_dialog.m") {
js_library("startup_url_entry.m") { js_library("startup_url_entry.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":startup_urls_page_browser_proxy.m",
"//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
"//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:icon.m",
"//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
] ]
extra_deps = [ ":startup_url_entry_module" ] extra_deps = [ ":startup_url_entry_module" ]
} }
...@@ -108,23 +126,25 @@ js_library("startup_url_entry.m") { ...@@ -108,23 +126,25 @@ js_library("startup_url_entry.m") {
js_library("startup_urls_page.m") { js_library("startup_urls_page.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":startup_url_entry.m",
":startup_urls_page_browser_proxy.m",
"//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
"//ui/webui/resources/js/cr/ui:focus_without_ink.m",
] ]
externs_list = [ "$externs_path/settings_private.js" ]
extra_deps = [ ":startup_urls_page_module" ] extra_deps = [ ":startup_urls_page_module" ]
} }
js_library("startup_urls_page_browser_proxy.m") { js_library("startup_urls_page_browser_proxy.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js" ]
deps = [ deps = [ "//ui/webui/resources/js:cr.m" ]
# TODO: Fill those in.
]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize" ]
} }
import("//tools/polymer/polymer.gni")
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":modulize", ":modulize",
":on_startup_page_module", ":on_startup_page_module",
":startup_url_dialog_module", ":startup_url_dialog_module",
...@@ -137,31 +157,46 @@ polymer_modulizer("on_startup_page") { ...@@ -137,31 +157,46 @@ polymer_modulizer("on_startup_page") {
js_file = "on_startup_page.js" js_file = "on_startup_page.js"
html_file = "on_startup_page.html" html_file = "on_startup_page.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ "chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.html|NtpExtension, OnStartupBrowserProxyImpl" ]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("startup_url_dialog") { polymer_modulizer("startup_url_dialog") {
js_file = "startup_url_dialog.js" js_file = "startup_url_dialog.js"
html_file = "startup_url_dialog.html" html_file = "startup_url_dialog.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl" ]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("startup_url_entry") { polymer_modulizer("startup_url_entry") {
js_file = "startup_url_entry.js" js_file = "startup_url_entry.js"
html_file = "startup_url_entry.html" html_file = "startup_url_entry.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [
"ui/webui/resources/html/assert.html|assert",
"chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxyImpl",
]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("startup_urls_page") { polymer_modulizer("startup_urls_page") {
js_file = "startup_urls_page.js" js_file = "startup_urls_page.js"
html_file = "startup_urls_page.html" html_file = "startup_urls_page.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [
"ui/webui/resources/cr_elements/cr_scrollable_behavior.html|CrScrollableBehavior",
"ui/webui/resources/html/assert.html|assert",
"chrome/browser/resources/settings/on_startup_page/startup_url_entry.html|EDIT_STARTUP_URL_EVENT",
"chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl",
]
namespace_rewrites = settings_namespace_rewrites
} }
import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [
"on_startup_browser_proxy.js", "on_startup_browser_proxy.js",
"startup_urls_page_browser_proxy.js", "startup_urls_page_browser_proxy.js",
] ]
namespace_rewrites = settings_namespace_rewrites
} }
...@@ -2,12 +2,16 @@ ...@@ -2,12 +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 {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
// clang-format on
/** @typedef {{id: string, name: string, canBeDisabled: boolean}} */ /** @typedef {{id: string, name: string, canBeDisabled: boolean}} */
let NtpExtension; /* #export */ let NtpExtension;
cr.define('settings', function() { cr.define('settings', function() {
/** @interface */ /** @interface */
class OnStartupBrowserProxy { /* #export */ class OnStartupBrowserProxy {
/** @return {!Promise<?NtpExtension>} */ /** @return {!Promise<?NtpExtension>} */
getNtpExtension() {} getNtpExtension() {}
} }
...@@ -15,7 +19,7 @@ cr.define('settings', function() { ...@@ -15,7 +19,7 @@ cr.define('settings', function() {
/** /**
* @implements {settings.OnStartupBrowserProxy} * @implements {settings.OnStartupBrowserProxy}
*/ */
class OnStartupBrowserProxyImpl { /* #export */ class OnStartupBrowserProxyImpl {
/** @override */ /** @override */
getNtpExtension() { getNtpExtension() {
return cr.sendWithPromise('getNtpExtension'); return cr.sendWithPromise('getNtpExtension');
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="import" href="../controls/settings_radio_group.html"> <link rel="import" href="../controls/settings_radio_group.html">
<link rel="import" href="on_startup_browser_proxy.html"> <link rel="import" href="on_startup_browser_proxy.html">
<link rel="import" href="startup_urls_page.html"> <link rel="import" href="startup_urls_page.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<dom-module id="settings-on-startup-page"> <dom-module id="settings-on-startup-page">
......
...@@ -52,7 +52,7 @@ Polymer({ ...@@ -52,7 +52,7 @@ Polymer({
actionButtonText_: String, actionButtonText_: String,
}, },
/** @private {!settings.SearchEnginesBrowserProxy} */ /** @private {?settings.StartupUrlsPageBrowserProxy} */
browserProxy_: null, browserProxy_: null,
/** @override */ /** @override */
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html"> <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.html"> <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/cr/ui/focus_row_behavior.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_row_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html">
<link rel="import" href="startup_urls_page_browser_proxy.html"> <link rel="import" href="startup_urls_page_browser_proxy.html">
......
...@@ -14,7 +14,7 @@ cr.define('settings', function() { ...@@ -14,7 +14,7 @@ cr.define('settings', function() {
* clicked. * clicked.
* @type {string} * @type {string}
*/ */
const EDIT_STARTUP_URL_EVENT = 'edit-startup-url'; /* #export */ const EDIT_STARTUP_URL_EVENT = 'edit-startup-url';
Polymer({ Polymer({
is: 'settings-startup-url-entry', is: 'settings-startup-url-entry',
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
// 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 {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
// clang-format on
/** /**
* @typedef {{ * @typedef {{
* modelIndex: number, * modelIndex: number,
...@@ -10,11 +14,11 @@ ...@@ -10,11 +14,11 @@
* url: string * url: string
* }} * }}
*/ */
let StartupPageInfo; /* #export */ let StartupPageInfo;
cr.define('settings', function() { cr.define('settings', function() {
/** @interface */ /** @interface */
class StartupUrlsPageBrowserProxy { /* #export */ class StartupUrlsPageBrowserProxy {
loadStartupPages() {} loadStartupPages() {}
useCurrentPages() {} useCurrentPages() {}
...@@ -46,7 +50,7 @@ cr.define('settings', function() { ...@@ -46,7 +50,7 @@ cr.define('settings', function() {
/** /**
* @implements {settings.StartupUrlsPageBrowserProxy} * @implements {settings.StartupUrlsPageBrowserProxy}
*/ */
class StartupUrlsPageBrowserProxyImpl { /* #export */ class StartupUrlsPageBrowserProxyImpl {
/** @override */ /** @override */
loadStartupPages() { loadStartupPages() {
chrome.send('onStartupPrefsPageLoad'); chrome.send('onStartupPrefsPageLoad');
......
...@@ -6,16 +6,19 @@ ...@@ -6,16 +6,19 @@
# targets in Settings. # targets in Settings.
settings_namespace_rewrites = [ settings_namespace_rewrites = [
"cr_slider.SliderTick|SliderTick", "cr_slider.SliderTick|SliderTick",
"settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy",
"settings.EDIT_STARTUP_URL_EVENT|EDIT_STARTUP_URL_EVENT",
"settings.ExtensionControlBrowserProxy|ExtensionControlBrowserProxy", "settings.ExtensionControlBrowserProxy|ExtensionControlBrowserProxy",
"settings.GlobalScrollTargetBehavior|GlobalScrollTargetBehavior", "settings.GlobalScrollTargetBehavior|GlobalScrollTargetBehavior",
"settings.MinimumRoutes|MinimumRoutes", "settings.MinimumRoutes|MinimumRoutes",
"settings.pageVisibility|pageVisibility", "settings.pageVisibility|pageVisibility",
"settings.OnStartupBrowserProxy|OnStartupBrowserProxy",
"Settings.PrefUtil.prefToString|prefToString", "Settings.PrefUtil.prefToString|prefToString",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue", "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
"settings.Route|Route", "settings.Route|Route",
"settings.routes|routes", "settings.routes|routes",
"settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy", "settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
"settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy", "settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
"action_link.m.js|action_link.js", "action_link.m.js|action_link.js",
......
...@@ -10,6 +10,8 @@ import './controls/settings_dropdown_menu.m.js'; ...@@ -10,6 +10,8 @@ import './controls/settings_dropdown_menu.m.js';
import './controls/settings_slider.m.js'; import './controls/settings_slider.m.js';
import './controls/settings_textarea.m.js'; import './controls/settings_textarea.m.js';
import './controls/settings_toggle_button.m.js'; import './controls/settings_toggle_button.m.js';
import './on_startup_page/on_startup_page.m.js';
import './on_startup_page/startup_urls_page.m.js';
import './site_favicon.m.js'; import './site_favicon.m.js';
import './search_engines_page/omnibox_extension_entry.m.js'; import './search_engines_page/omnibox_extension_entry.m.js';
import './search_engines_page/search_engine_dialog.m.js'; import './search_engines_page/search_engine_dialog.m.js';
...@@ -28,6 +30,9 @@ export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_bro ...@@ -28,6 +30,9 @@ export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_bro
// </if> // </if>
export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js'; export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js';
export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_browser_proxy.m.js';
export {EDIT_STARTUP_URL_EVENT} from './on_startup_page/startup_url_entry.m.js';
export {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js';
export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js'; export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js';
export {Route, Router} from './router.m.js'; export {Route, Router} from './router.m.js';
export {SearchEnginesBrowserProxyImpl} from './search_engines_page/search_engines_browser_proxy.m.js'; export {SearchEnginesBrowserProxyImpl} from './search_engines_page/search_engines_browser_proxy.m.js';
...@@ -75,6 +75,30 @@ ...@@ -75,6 +75,30 @@
use_base_dir="false" use_base_dir="false"
type="BINDATA" type="BINDATA"
preprocess="true" /> preprocess="true" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_PAGE_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_DIALOG_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_ENTRY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_BROWSER_PROXY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_PAGE_VISIBILITY_M_JS" <include name="IDR_SETTINGS_PAGE_VISIBILITY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js"
use_base_dir="false" use_base_dir="false"
......
...@@ -157,6 +157,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) ...@@ -157,6 +157,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
// Currently only used for testing the Polymer 3 version of // Currently only used for testing the Polymer 3 version of
// certificate-manager. // certificate-manager.
#if BUILDFLAG(OPTIMIZE_WEBUI) #if BUILDFLAG(OPTIMIZE_WEBUI)
html_source->EnableReplaceI18nInJS();
html_source->OverrideContentSecurityPolicyScriptSrc( html_source->OverrideContentSecurityPolicyScriptSrc(
"script-src chrome://resources chrome://test 'self';"); "script-src chrome://resources chrome://test 'self';");
html_source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER); html_source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER);
......
...@@ -215,6 +215,7 @@ js2gtest("browser_tests_js_webui") { ...@@ -215,6 +215,7 @@ js2gtest("browser_tests_js_webui") {
"$root_gen_dir/chrome/test/data/webui/settings/default_browser_browsertest.m.js", "$root_gen_dir/chrome/test/data/webui/settings/default_browser_browsertest.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/dropdown_menu_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/dropdown_menu_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/extension_controlled_indicator_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/extension_controlled_indicator_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/on_startup_page_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/search_engines_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/search_engines_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/search_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/search_page_test.m.js",
...@@ -223,6 +224,7 @@ js2gtest("browser_tests_js_webui") { ...@@ -223,6 +224,7 @@ js2gtest("browser_tests_js_webui") {
"$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/settings_toggle_button_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/settings_toggle_button_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/site_favicon_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/site_favicon_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/startup_urls_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/test_extension_control_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_extension_control_browser_proxy.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/test_util.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_util.m.js",
......
...@@ -12,6 +12,7 @@ js_modulizer("modulize") { ...@@ -12,6 +12,7 @@ js_modulizer("modulize") {
"default_browser_browsertest.js", "default_browser_browsertest.js",
"dropdown_menu_tests.js", "dropdown_menu_tests.js",
"extension_controlled_indicator_tests.js", "extension_controlled_indicator_tests.js",
"on_startup_page_tests.js",
"pref_util_tests.js", "pref_util_tests.js",
"settings_animated_pages_test.js", "settings_animated_pages_test.js",
"search_engines_page_test.js", "search_engines_page_test.js",
...@@ -21,6 +22,7 @@ js_modulizer("modulize") { ...@@ -21,6 +22,7 @@ js_modulizer("modulize") {
"settings_subpage_test.js", "settings_subpage_test.js",
"settings_textarea_tests.js", "settings_textarea_tests.js",
"settings_toggle_button_tests.js", "settings_toggle_button_tests.js",
"startup_urls_page_test.js",
"test_extension_control_browser_proxy.js", "test_extension_control_browser_proxy.js",
"test_search_engines_browser_proxy.js", "test_search_engines_browser_proxy.js",
"test_util.js", "test_util.js",
...@@ -34,12 +36,16 @@ js_modulizer("modulize") { ...@@ -34,12 +36,16 @@ js_modulizer("modulize") {
"test_util.flushTasks|flushTasks", "test_util.flushTasks|flushTasks",
"test_util.setupPopstateListener|setupPopstateListener", "test_util.setupPopstateListener|setupPopstateListener",
"MockInteractions.keyDownOn|keyDownOn", "MockInteractions.keyDownOn|keyDownOn",
"MockInteractions.keyEventOn|keyEventOn",
"MockInteractions.keyUpOn|keyUpOn", "MockInteractions.keyUpOn|keyUpOn",
"Settings.PrefUtil.prefToString|prefToString", "Settings.PrefUtil.prefToString|prefToString",
"global.traceAssertionsForTesting|window.traceAssertionsForTesting", "global.traceAssertionsForTesting|window.traceAssertionsForTesting",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue", "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
"settings_search.TestSearchEnginesBrowserProxy|TestSearchEnginesBrowserProxy", "settings_search.TestSearchEnginesBrowserProxy|TestSearchEnginesBrowserProxy",
"settings_search.createSampleSearchEngine|createSampleSearchEngine", "settings_search.createSampleSearchEngine|createSampleSearchEngine",
"settings.EDIT_STARTUP_URL_EVENT|EDIT_STARTUP_URL_EVENT",
"settings.OnStartupBrowserProxy|OnStartupBrowserProxy",
"settings.SearchEnginesBrowserProxyImpl|SearchEnginesBrowserProxyImpl", "settings.SearchEnginesBrowserProxyImpl|SearchEnginesBrowserProxyImpl",
"settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
] ]
} }
...@@ -197,3 +197,27 @@ var CrSettingsSearchPageV3Test = class extends CrSettingsV3BrowserTest { ...@@ -197,3 +197,27 @@ var CrSettingsSearchPageV3Test = class extends CrSettingsV3BrowserTest {
TEST_F('CrSettingsSearchPageV3Test', 'All', function() { TEST_F('CrSettingsSearchPageV3Test', 'All', function() {
mocha.run(); mocha.run();
}); });
// eslint-disable-next-line no-var
var CrSettingsOnStartupPageV3Test = class extends CrSettingsV3BrowserTest {
/** @override */
get browsePreload() {
return 'chrome://settings/test_loader.html?module=settings/on_startup_page_tests.m.js';
}
};
TEST_F('CrSettingsOnStartupPageV3Test', 'All', function() {
mocha.run();
});
// eslint-disable-next-line no-var
var CrSettingsStartupUrlsPageV3Test = class extends CrSettingsV3BrowserTest {
/** @override */
get browsePreload() {
return 'chrome://settings/test_loader.html?module=settings/startup_urls_page_test.m.js';
}
};
TEST_F('CrSettingsStartupUrlsPageV3Test', 'All', function() {
mocha.run();
});
...@@ -2,7 +2,13 @@ ...@@ -2,7 +2,13 @@
// 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.
/** @implements {settings.ProfileInfoBrowserProxy} */ // clang-format off
// #import {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from 'chrome://settings/settings.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
// clang-format on
/** @implements {settings.OnStartupBrowserProxy} */
class TestOnStartupBrowserProxy extends TestBrowserProxy { class TestOnStartupBrowserProxy extends TestBrowserProxy {
constructor() { constructor() {
super(['getNtpExtension']); super(['getNtpExtension']);
......
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
// 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 {EDIT_STARTUP_URL_EVENT, StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from 'chrome://settings/settings.js';
// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
// #import {keyEventOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
// clang-format on
cr.define('settings_startup_urls_page', function() { cr.define('settings_startup_urls_page', function() {
/** @implements {settings.StartupUrlsPageBrowserProxy} */ /** @implements {settings.StartupUrlsPageBrowserProxy} */
class TestStartupUrlsPageBrowserProxy extends TestBrowserProxy { class TestStartupUrlsPageBrowserProxy extends TestBrowserProxy {
...@@ -367,4 +374,5 @@ cr.define('settings_startup_urls_page', function() { ...@@ -367,4 +374,5 @@ cr.define('settings_startup_urls_page', function() {
assertTrue(!!element.$$('#dots')); assertTrue(!!element.$$('#dots'));
}); });
}); });
// #cr_define_end
}); });
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