Commit 9d5530bd authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

Settings: Extract common polymer_modulizer params to their own .gni file.

 - Adding a new c/b/r/settings/settings.gni file.
 - Defining |settings_namespace_rewrites| and |settings_auto_imports|
   holding common Settings-related entries
 - Also extract a few non-Settings common rewrites to
   tools/polymer/polymer.gni

This is so that they can be reused across multiple BUILD.fn files.

Bug: 1026426
Change-Id: I11ee3b4e30d3e4871b9483e2a7a9ff5ec8bae7fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032568
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737426}
parent 07b25655
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni") import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni") import("//ui/webui/resources/tools/js_modulizer.gni")
import("../settings.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
...@@ -289,34 +290,23 @@ group("polymer3_elements") { ...@@ -289,34 +290,23 @@ group("polymer3_elements") {
] ]
} }
settings_controls_rewrites = [
"cr_slider.SliderTick|SliderTick",
"settings.ExtensionControlBrowserProxyImpl|ExtensionControlBrowserProxyImpl",
"Settings.PrefUtil.prefToString|prefToString",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
]
polymer_modulizer("controlled_button") { polymer_modulizer("controlled_button") {
js_file = "controlled_button.js" js_file = "controlled_button.js"
html_file = "controlled_button.html" html_file = "controlled_button.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ auto_imports = settings_auto_imports
"chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior",
"ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior",
]
} }
polymer_modulizer("controlled_radio_button") { polymer_modulizer("controlled_radio_button") {
js_file = "controlled_radio_button.js" js_file = "controlled_radio_button.js"
html_file = "controlled_radio_button.html" html_file = "controlled_radio_button.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ auto_imports =
"ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_behavior.html|CrRadioButtonBehavior", settings_auto_imports + [
"chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior", "ui/webui/resources/html/assert.html|assert",
"ui/webui/resources/html/assert.html|assert", "chrome/browser/resources/settings/prefs/pref_util.html|prefToString",
"chrome/browser/resources/settings/prefs/pref_util.html|prefToString", ]
] namespace_rewrites = settings_namespace_rewrites
namespace_rewrites = settings_controls_rewrites
} }
polymer_modulizer("extension_controlled_indicator") { polymer_modulizer("extension_controlled_indicator") {
...@@ -327,7 +317,7 @@ polymer_modulizer("extension_controlled_indicator") { ...@@ -327,7 +317,7 @@ polymer_modulizer("extension_controlled_indicator") {
"chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl", "chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl",
"ui/webui/resources/html/assert.html|assert", "ui/webui/resources/html/assert.html|assert",
] ]
namespace_rewrites = settings_controls_rewrites namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("password_prompt_dialog") { polymer_modulizer("password_prompt_dialog") {
...@@ -340,44 +330,38 @@ polymer_modulizer("settings_checkbox") { ...@@ -340,44 +330,38 @@ polymer_modulizer("settings_checkbox") {
js_file = "settings_checkbox.js" js_file = "settings_checkbox.js"
html_file = "settings_checkbox.html" html_file = "settings_checkbox.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ "chrome/browser/resources/settings/controls/settings_boolean_control_behavior.html|SettingsBooleanControlBehavior" ] auto_imports = settings_auto_imports
} }
polymer_modulizer("settings_dropdown_menu") { polymer_modulizer("settings_dropdown_menu") {
js_file = "settings_dropdown_menu.js" js_file = "settings_dropdown_menu.js"
html_file = "settings_dropdown_menu.html" html_file = "settings_dropdown_menu.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ auto_imports = settings_auto_imports + [
"chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior", "chrome/browser/resources/settings/prefs/pref_util.html|stringToPrefValue, prefToString",
"chrome/browser/resources/settings/prefs/pref_util.html|stringToPrefValue, prefToString", "ui/webui/resources/html/assert.html|assert",
"ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior", ]
"ui/webui/resources/html/assert.html|assert", namespace_rewrites = settings_namespace_rewrites
]
namespace_rewrites = settings_controls_rewrites
} }
polymer_modulizer("settings_radio_group") { polymer_modulizer("settings_radio_group") {
js_file = "settings_radio_group.js" js_file = "settings_radio_group.js"
html_file = "settings_radio_group.html" html_file = "settings_radio_group.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/prefs/pref_util.html|stringToPrefValue, prefToString" ]
"chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior", namespace_rewrites = settings_namespace_rewrites
"chrome/browser/resources/settings/prefs/pref_util.html|stringToPrefValue, prefToString",
]
namespace_rewrites = settings_controls_rewrites
} }
polymer_modulizer("settings_slider") { polymer_modulizer("settings_slider") {
js_file = "settings_slider.js" js_file = "settings_slider.js"
html_file = "settings_slider.html" html_file = "settings_slider.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ auto_imports =
"chrome/browser/resources/settings/i18n_setup.html|loadTimeData", settings_auto_imports + [
"ui/webui/resources/html/assert.html|assert", "ui/webui/resources/html/assert.html|assert",
"ui/webui/resources/cr_elements/cr_slider/cr_slider.html|SliderTick", "ui/webui/resources/cr_elements/cr_slider/cr_slider.html|SliderTick",
"ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior", ]
] namespace_rewrites = settings_namespace_rewrites
namespace_rewrites = settings_controls_rewrites
} }
polymer_modulizer("settings_textarea") { polymer_modulizer("settings_textarea") {
...@@ -390,7 +374,7 @@ polymer_modulizer("settings_toggle_button") { ...@@ -390,7 +374,7 @@ polymer_modulizer("settings_toggle_button") {
js_file = "settings_toggle_button.js" js_file = "settings_toggle_button.js"
html_file = "settings_toggle_button.html" html_file = "settings_toggle_button.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = [ "chrome/browser/resources/settings/controls/settings_boolean_control_behavior.html|SettingsBooleanControlBehavior" ] auto_imports = settings_auto_imports
} }
js_modulizer("modulize") { js_modulizer("modulize") {
......
# 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.
# Common namespace rewrites for all polymer_modulizer() or js_modulizer()
# targets in Settings.
settings_namespace_rewrites = [
"cr_slider.SliderTick|SliderTick",
"settings.ExtensionControlBrowserProxyImpl|ExtensionControlBrowserProxyImpl",
"Settings.PrefUtil.prefToString|prefToString",
"Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
# TODO(1026426): Add more entries above as needed.
]
settings_auto_imports = [
"chrome/browser/resources/settings/i18n_setup.html|loadTimeData",
"chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior",
"chrome/browser/resources/settings/controls/settings_boolean_control_behavior.html|SettingsBooleanControlBehavior",
]
...@@ -15,6 +15,8 @@ common_namespace_rewrites_polymer = [ ...@@ -15,6 +15,8 @@ common_namespace_rewrites_polymer = [
common_auto_imports = [ common_auto_imports = [
"third_party/polymer/v1_0/components-chromium/iron-a11y-announcer/iron-a11y-announcer.html|IronA11yAnnouncer", "third_party/polymer/v1_0/components-chromium/iron-a11y-announcer/iron-a11y-announcer.html|IronA11yAnnouncer",
"third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior.html|PaperRippleBehavior", "third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior.html|PaperRippleBehavior",
"ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_behavior.html|CrRadioButtonBehavior",
"ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior",
"ui/webui/resources/html/cr/ui/focus_outline_manager.html|FocusOutlineManager", "ui/webui/resources/html/cr/ui/focus_outline_manager.html|FocusOutlineManager",
"ui/webui/resources/html/cr/ui/focus_without_ink.html|focusWithoutInk", "ui/webui/resources/html/cr/ui/focus_without_ink.html|focusWithoutInk",
"ui/webui/resources/html/i18n_behavior.html|I18nBehavior", "ui/webui/resources/html/i18n_behavior.html|I18nBehavior",
......
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