Commit 16710dfc authored by Kristi Park's avatar Kristi Park Committed by Commit Bot

Revert "Settings: Port settings_menu/ to Polymer 3."

This reverts commit d5544fc0.

Reason for revert: Suspect for continuously failing CrSettingsAnimatedPagesV3Test.All and CrSettings* related tests
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/16982

Original change's description:
> Settings: Port settings_menu/ to Polymer 3.
> 
> Bug: 1026426
> Change-Id: Id6b62c39b9184532a8e3e3c34c2bdee98a37240e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2045171
> Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
> Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
> Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#740247}

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

Change-Id: I029222c3bee9a354964d4d5fa8d02f724c7c4039
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1026426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050868Reviewed-by: default avatarKristi Park <kristipark@chromium.org>
Commit-Queue: Kristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740350}
parent 93e2ade6
...@@ -219,7 +219,6 @@ group("closure_compile_module") { ...@@ -219,7 +219,6 @@ group("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",
"settings_menu:closure_compile_module",
"settings_page:closure_compile_module", "settings_page:closure_compile_module",
] ]
if (!is_chromeos) { if (!is_chromeos) {
......
<link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="i18n_setup.html">
<script src="page_visibility.js"></script> <script src="page_visibility.js"></script>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* reset: (boolean|undefined), * reset: (boolean|undefined),
* }} * }}
*/ */
/* #export */ let PageVisibility; let PageVisibility;
/** /**
* @typedef {{ * @typedef {{
......
...@@ -19,7 +19,6 @@ settings_namespace_rewrites = [ ...@@ -19,7 +19,6 @@ settings_namespace_rewrites = [
"settings.routes|routes", "settings.routes|routes",
"settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy", "settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
"settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy", "settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
"settings.RouteObserverBehavior|RouteObserverBehavior",
"action_link.m.js|action_link.js", "action_link.m.js|action_link.js",
......
...@@ -18,7 +18,6 @@ import './search_engines_page/search_engine_dialog.m.js'; ...@@ -18,7 +18,6 @@ import './search_engines_page/search_engine_dialog.m.js';
import './search_engines_page/search_engine_entry.m.js'; import './search_engines_page/search_engine_entry.m.js';
import './search_engines_page/search_engines_page.m.js'; import './search_engines_page/search_engines_page.m.js';
import './search_page/search_page.m.js'; import './search_page/search_page.m.js';
import './settings_menu/settings_menu.m.js';
import './settings_page/settings_subpage.m.js'; import './settings_page/settings_subpage.m.js';
import './settings_page/settings_animated_pages.m.js'; import './settings_page/settings_animated_pages.m.js';
...@@ -34,8 +33,6 @@ export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_prox ...@@ -34,8 +33,6 @@ export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_prox
export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_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 {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 {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js';
export {pageVisibility} from './page_visibility.m.js';
export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js'; export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js';
export {routes} from './route.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';
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# 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("../settings.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ ":settings_menu" ] deps = [ ":settings_menu" ]
...@@ -18,34 +16,28 @@ js_library("settings_menu") { ...@@ -18,34 +16,28 @@ js_library("settings_menu") {
] ]
} }
js_type_check("closure_compile_module") { # TODO(crbug.com/1026426): Fix and enable.
is_polymer3 = true #js_type_check("closure_compile_module") {
deps = [ ":settings_menu.m" ] # is_polymer3 = true
} # deps = [ ":settings_menu.m" ]
#}
js_library("settings_menu.m") { js_library("settings_menu.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_menu/settings_menu.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_menu/settings_menu.m.js" ]
deps = [ deps = [
"..:page_visibility.m", # TODO: Fill those in.
"..:router.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:assert.m",
] ]
extra_deps = [ ":settings_menu_module" ] extra_deps = [ ":settings_menu_module" ]
} }
import("//tools/polymer/polymer.gni")
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ ":settings_menu_module" ] deps = [ ":settings_menu_module" ]
} }
polymer_modulizer("settings_menu") { polymer_modulizer("settings_menu") {
js_file = "settings_menu.js" js_file = "settings_menu.js"
html_file = "settings_menu.html" html_file = "settings_menu.html"
html_type = "dom-module" html_type = "dom-module"
namespace_rewrites = settings_namespace_rewrites
auto_imports = [
"chrome/browser/resources/settings/page_visibility.html|PageVisibility",
"chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router,Route",
"ui/webui/resources/html/assert.html|assert",
]
} }
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
<link rel="import" href="../icons.html"> <link rel="import" href="../icons.html">
<link rel="import" href="../page_visibility.html">
<link rel="import" href="../route.html"> <link rel="import" href="../route.html">
<link rel="import" href="../router.html"> <link rel="import" href="../router.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
......
...@@ -75,10 +75,6 @@ ...@@ -75,10 +75,6 @@
use_base_dir="false" use_base_dir="false"
type="BINDATA" type="BINDATA"
preprocess="true" /> preprocess="true" />
<include name="IDR_SETTINGS_MENU_SETTINGS_MENU_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_M_JS" <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" file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js"
use_base_dir="false" use_base_dir="false"
......
...@@ -219,7 +219,6 @@ js2gtest("browser_tests_js_webui") { ...@@ -219,7 +219,6 @@ js2gtest("browser_tests_js_webui") {
"$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",
"$root_gen_dir/chrome/test/data/webui/settings/settings_menu_test.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js",
"$root_gen_dir/chrome/test/data/webui/settings/settings_subpage_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/settings_subpage_test.m.js",
"$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",
......
...@@ -20,7 +20,6 @@ js_modulizer("modulize") { ...@@ -20,7 +20,6 @@ js_modulizer("modulize") {
"search_engines_page_test.js", "search_engines_page_test.js",
"search_page_test.js", "search_page_test.js",
"site_favicon_test.js", "site_favicon_test.js",
"settings_menu_test.js",
"settings_slider_tests.js", "settings_slider_tests.js",
"settings_subpage_test.js", "settings_subpage_test.js",
"settings_textarea_tests.js", "settings_textarea_tests.js",
......
...@@ -221,15 +221,3 @@ var CrSettingsStartupUrlsPageV3Test = class extends CrSettingsV3BrowserTest { ...@@ -221,15 +221,3 @@ var CrSettingsStartupUrlsPageV3Test = class extends CrSettingsV3BrowserTest {
TEST_F('CrSettingsStartupUrlsPageV3Test', 'All', function() { TEST_F('CrSettingsStartupUrlsPageV3Test', 'All', function() {
mocha.run(); mocha.run();
}); });
// eslint-disable-next-line no-var
var CrSettingsMenuV3Test = class extends CrSettingsV3BrowserTest {
/** @override */
get browsePreload() {
return 'chrome://settings/test_loader.html?module=settings/settings_menu_test.m.js';
}
};
TEST_F('CrSettingsMenuV3Test', 'SettingsMenu', function() {
mocha.run();
});
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