Commit 544daa48 authored by Finnur Thorarinsson's avatar Finnur Thorarinsson Committed by Commit Bot

Revert "Settings: Port on_startup_page/* to Polymer 3"

This reverts commit a3d37b5f.

Reason for revert: ChromeOS build bot...
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg
...  started failing a CrSettingsAnimatedPagesTest.All consistently. Reverting to see if this is related. If test continues to fail, we can unrevert.

Original change's description:
> 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: Demetrios Papadopoulos <dpapad@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#739259}

TBR=dpapad@chromium.org,rbpotter@chromium.org

Change-Id: I91d6a678ce1d1b0324ca4da0746981982cf35e73
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1026426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2044113Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739376}
parent f9a31275
......@@ -212,7 +212,6 @@ group("closure_compile_module") {
deps = [
":closure_compile_local_module",
"controls:closure_compile_module",
"on_startup_page:closure_compile_module",
"prefs:closure_compile_module",
"search_engines_page:closure_compile_module",
"search_page:closure_compile_module",
......
......@@ -3,15 +3,11 @@
# found in the LICENSE file.
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") {
deps = [
":on_startup_browser_proxy",
":on_startup_page",
":startup_url_dialog",
":startup_url_entry",
":startup_urls_page",
":startup_urls_page_browser_proxy",
......@@ -64,38 +60,31 @@ js_library("startup_url_entry") {
]
}
js_library("startup_url_dialog") {
deps = [
":startup_urls_page_browser_proxy",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:load_time_data",
]
}
js_type_check("closure_compile_module") {
is_polymer3 = true
deps = [
":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",
]
}
# TODO(crbug.com/1026426): Fix and enable.
#js_type_check("closure_compile_module") {
# is_polymer3 = true
# deps = [
# ":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" ]
deps = [
# TODO: Fill those in.
]
extra_deps = [ ":modulize" ]
}
js_library("on_startup_page.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js" ]
deps = [
":on_startup_browser_proxy.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
# TODO: Fill those in.
]
extra_deps = [ ":on_startup_page_module" ]
}
......@@ -103,9 +92,7 @@ js_library("on_startup_page.m") {
js_library("startup_url_dialog.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js" ]
deps = [
":startup_urls_page_browser_proxy.m",
"..:i18n_setup.m",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
# TODO: Fill those in.
]
extra_deps = [ ":startup_url_dialog_module" ]
}
......@@ -113,12 +100,7 @@ js_library("startup_url_dialog.m") {
js_library("startup_url_entry.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js" ]
deps = [
":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",
# TODO: Fill those in.
]
extra_deps = [ ":startup_url_entry_module" ]
}
......@@ -126,25 +108,23 @@ js_library("startup_url_entry.m") {
js_library("startup_urls_page.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js" ]
deps = [
":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",
# TODO: Fill those in.
]
externs_list = [ "$externs_path/settings_private.js" ]
extra_deps = [ ":startup_urls_page_module" ]
}
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" ]
deps = [ "//ui/webui/resources/js:cr.m" ]
deps = [
# TODO: Fill those in.
]
extra_deps = [ ":modulize" ]
}
import("//tools/polymer/polymer.gni")
group("polymer3_elements") {
public_deps = [
deps = [
":modulize",
":on_startup_page_module",
":startup_url_dialog_module",
......@@ -157,46 +137,31 @@ polymer_modulizer("on_startup_page") {
js_file = "on_startup_page.js"
html_file = "on_startup_page.html"
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") {
js_file = "startup_url_dialog.js"
html_file = "startup_url_dialog.html"
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") {
js_file = "startup_url_entry.js"
html_file = "startup_url_entry.html"
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") {
js_file = "startup_urls_page.js"
html_file = "startup_urls_page.html"
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") {
input_files = [
"on_startup_browser_proxy.js",
"startup_urls_page_browser_proxy.js",
]
namespace_rewrites = settings_namespace_rewrites
}
......@@ -2,16 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// 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}} */
/* #export */ let NtpExtension;
let NtpExtension;
cr.define('settings', function() {
/** @interface */
/* #export */ class OnStartupBrowserProxy {
class OnStartupBrowserProxy {
/** @return {!Promise<?NtpExtension>} */
getNtpExtension() {}
}
......@@ -19,7 +15,7 @@ cr.define('settings', function() {
/**
* @implements {settings.OnStartupBrowserProxy}
*/
/* #export */ class OnStartupBrowserProxyImpl {
class OnStartupBrowserProxyImpl {
/** @override */
getNtpExtension() {
return cr.sendWithPromise('getNtpExtension');
......
......@@ -6,7 +6,6 @@
<link rel="import" href="../controls/settings_radio_group.html">
<link rel="import" href="on_startup_browser_proxy.html">
<link rel="import" href="startup_urls_page.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../settings_shared_css.html">
<dom-module id="settings-on-startup-page">
......
......@@ -52,7 +52,7 @@ Polymer({
actionButtonText_: String,
},
/** @private {?settings.StartupUrlsPageBrowserProxy} */
/** @private {!settings.SearchEnginesBrowserProxy} */
browserProxy_: null,
/** @override */
......
......@@ -3,7 +3,6 @@
<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_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/cr_elements/icons.html">
<link rel="import" href="startup_urls_page_browser_proxy.html">
......
......@@ -14,7 +14,7 @@ cr.define('settings', function() {
* clicked.
* @type {string}
*/
/* #export */ const EDIT_STARTUP_URL_EVENT = 'edit-startup-url';
const EDIT_STARTUP_URL_EVENT = 'edit-startup-url';
Polymer({
is: 'settings-startup-url-entry',
......
......@@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// clang-format off
// #import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
// clang-format on
/**
* @typedef {{
* modelIndex: number,
......@@ -14,11 +10,11 @@
* url: string
* }}
*/
/* #export */ let StartupPageInfo;
let StartupPageInfo;
cr.define('settings', function() {
/** @interface */
/* #export */ class StartupUrlsPageBrowserProxy {
class StartupUrlsPageBrowserProxy {
loadStartupPages() {}
useCurrentPages() {}
......@@ -50,7 +46,7 @@ cr.define('settings', function() {
/**
* @implements {settings.StartupUrlsPageBrowserProxy}
*/
/* #export */ class StartupUrlsPageBrowserProxyImpl {
class StartupUrlsPageBrowserProxyImpl {
/** @override */
loadStartupPages() {
chrome.send('onStartupPrefsPageLoad');
......
......@@ -6,19 +6,16 @@
# targets in Settings.
settings_namespace_rewrites = [
"cr_slider.SliderTick|SliderTick",
"settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy",
"settings.EDIT_STARTUP_URL_EVENT|EDIT_STARTUP_URL_EVENT",
"settings.ExtensionControlBrowserProxy|ExtensionControlBrowserProxy",
"settings.GlobalScrollTargetBehavior|GlobalScrollTargetBehavior",
"settings.MinimumRoutes|MinimumRoutes",
"settings.pageVisibility|pageVisibility",
"settings.OnStartupBrowserProxy|OnStartupBrowserProxy",
"Settings.PrefUtil.prefToString|prefToString",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
"settings.Route|Route",
"settings.routes|routes",
"settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
"settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
"settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy",
"action_link.m.js|action_link.js",
......
......@@ -10,8 +10,6 @@ import './controls/settings_dropdown_menu.m.js';
import './controls/settings_slider.m.js';
import './controls/settings_textarea.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 './search_engines_page/omnibox_extension_entry.m.js';
import './search_engines_page/search_engine_dialog.m.js';
......@@ -30,9 +28,6 @@ export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_bro
// </if>
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 {Route, Router} from './router.m.js';
export {SearchEnginesBrowserProxyImpl} from './search_engines_page/search_engines_browser_proxy.m.js';
......@@ -75,30 +75,6 @@
use_base_dir="false"
type="BINDATA"
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"
file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js"
use_base_dir="false"
......
......@@ -157,7 +157,6 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
// Currently only used for testing the Polymer 3 version of
// certificate-manager.
#if BUILDFLAG(OPTIMIZE_WEBUI)
html_source->EnableReplaceI18nInJS();
html_source->OverrideContentSecurityPolicyScriptSrc(
"script-src chrome://resources chrome://test 'self';");
html_source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER);
......
......@@ -215,7 +215,6 @@ 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/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/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/search_engines_page_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/search_page_test.m.js",
......@@ -224,7 +223,6 @@ 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_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/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_search_engines_browser_proxy.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/test_util.m.js",
......
......@@ -12,7 +12,6 @@ js_modulizer("modulize") {
"default_browser_browsertest.js",
"dropdown_menu_tests.js",
"extension_controlled_indicator_tests.js",
"on_startup_page_tests.js",
"pref_util_tests.js",
"settings_animated_pages_test.js",
"search_engines_page_test.js",
......@@ -22,7 +21,6 @@ js_modulizer("modulize") {
"settings_subpage_test.js",
"settings_textarea_tests.js",
"settings_toggle_button_tests.js",
"startup_urls_page_test.js",
"test_extension_control_browser_proxy.js",
"test_search_engines_browser_proxy.js",
"test_util.js",
......@@ -36,16 +34,12 @@ js_modulizer("modulize") {
"test_util.flushTasks|flushTasks",
"test_util.setupPopstateListener|setupPopstateListener",
"MockInteractions.keyDownOn|keyDownOn",
"MockInteractions.keyEventOn|keyEventOn",
"MockInteractions.keyUpOn|keyUpOn",
"Settings.PrefUtil.prefToString|prefToString",
"global.traceAssertionsForTesting|window.traceAssertionsForTesting",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
"settings_search.TestSearchEnginesBrowserProxy|TestSearchEnginesBrowserProxy",
"settings_search.createSampleSearchEngine|createSampleSearchEngine",
"settings.EDIT_STARTUP_URL_EVENT|EDIT_STARTUP_URL_EVENT",
"settings.OnStartupBrowserProxy|OnStartupBrowserProxy",
"settings.SearchEnginesBrowserProxyImpl|SearchEnginesBrowserProxyImpl",
"settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
]
}
......@@ -197,27 +197,3 @@ var CrSettingsSearchPageV3Test = class extends CrSettingsV3BrowserTest {
TEST_F('CrSettingsSearchPageV3Test', 'All', function() {
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,13 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// 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} */
/** @implements {settings.ProfileInfoBrowserProxy} */
class TestOnStartupBrowserProxy extends TestBrowserProxy {
constructor() {
super(['getNtpExtension']);
......
......@@ -2,13 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// 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() {
/** @implements {settings.StartupUrlsPageBrowserProxy} */
class TestStartupUrlsPageBrowserProxy extends TestBrowserProxy {
......@@ -374,5 +367,4 @@ cr.define('settings_startup_urls_page', function() {
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