Skip to content

GitLab

T
tangled
Commit 41e9150f authored by michaelpg's avatar michaelpg Committed by Commit bot
Browse files
Options

Remove enable_polymer_v08 flag from build 

Always build Polymer 0.8 and 0.5. Polymer 0.5 should be removed in M45.

BUG=483080
R=jlklein@chromium.org
TEST=manual

Review URL: https://codereview.chromium.org/1134753009

Cr-Commit-Position: refs/heads/master@{#330666}
parent 4e0f76e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 445 deletions
ui/resources/BUILD.gn
View file @ 41e9150f
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni") import("//tools/grit/repack.gni")
declare_args() {
# Enable to include Polymer 0.8 in the binary.
enable_polymer_v08 = false
}
# GYP version: ui/resources/ui_resources.gyp:ui_resources # GYP version: ui/resources/ui_resources.gyp:ui_resources
group("resources") { group("resources") {
deps = [ deps = [
...@@ -40,11 +35,6 @@ grit("ui_unscaled_resources_grd") { ...@@ -40,11 +35,6 @@ grit("ui_unscaled_resources_grd") {
] ]
} }
webui_grit_defines = []
if (enable_polymer_v08) {
webui_grit_defines += [ "enable_polymer_v08" ]
}
grit("webui_resources_grd") { grit("webui_resources_grd") {
source = "../webui/resources/webui_resources.grd" source = "../webui/resources/webui_resources.grd"
outputs = [ outputs = [
...@@ -53,7 +43,6 @@ grit("webui_resources_grd") { ...@@ -53,7 +43,6 @@ grit("webui_resources_grd") {
"grit/webui_resources_map.h", "grit/webui_resources_map.h",
"webui_resources.pak", "webui_resources.pak",
] ]
defines = webui_grit_defines
} }
if (!is_mac) { if (!is_mac) {
......
ui/resources/ui_resources.gyp
View file @ 41e9150f
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
'target_name': 'ui_resources', 'target_name': 'ui_resources',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
# Enable to include Polymer 0.8 in the binary.
'enable_polymer_v08%': 0,
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/resources', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/resources',
}, },
'actions': [ 'actions': [
...@@ -26,12 +23,6 @@ ...@@ -26,12 +23,6 @@
'action_name': 'webui_resources', 'action_name': 'webui_resources',
'variables': { 'variables': {
'grit_grd_file': '../webui/resources/webui_resources.grd', 'grit_grd_file': '../webui/resources/webui_resources.grd',
'conditions': [
['enable_polymer_v08==1', {
'grit_defines': ['-D', 'enable_polymer_v08'],
}],
],
}, },
'includes': [ '../../build/grit_action.gypi' ], 'includes': [ '../../build/grit_action.gypi' ],
}, },
......
ui/webui/resources/cr_elements_resources.grdp
View file @ 41e9150f
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<grit-part> <grit-part>
<!-- Polymer 0.5 Elements (TODO: Remove by M45 branch point) -->
<structure name="IDR_CR_ELEMENTS_CR_BUTTON_CSS" <structure name="IDR_CR_ELEMENTS_CR_BUTTON_CSS"
file="../../webui/resources/cr_elements/cr_button/cr_button.css" file="../../webui/resources/cr_elements/cr_button/cr_button.css"
type="chrome_html" /> type="chrome_html" />
...@@ -104,84 +105,82 @@ ...@@ -104,84 +105,82 @@
type="chrome_html" /> type="chrome_html" />
<!-- Polymer 0.8 Elements --> <!-- Polymer 0.8 Elements -->
<if expr="enable_polymer_v08"> <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_HTML" file="../../webui/resources/cr_elements/v0_8/demo_element.html"
file="../../webui/resources/cr_elements/v0_8/demo_element.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_JS" file="../../webui/resources/cr_elements/v0_8/demo_element.js"
file="../../webui/resources/cr_elements/v0_8/demo_element.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_PAGE_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_DEMO_PAGE_HTML" file="../../webui/resources/cr_elements/v0_8/demo_page.html"
file="../../webui/resources/cr_elements/v0_8/demo_page.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_CSS" file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.css"
file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_HTML" file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.html"
file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_JS" file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.js"
file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_CSS" file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.css"
file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_HTML" file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.html"
file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_JS" file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.js"
file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_CSS" file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.css"
file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_HTML" file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.html"
file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_JS" file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.js"
file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_HTML" file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.html"
file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_JS" file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.js"
file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_INPUT_CSS" file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.css"
file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_INPUT_HTML" file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.html"
file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_INPUT_JS" file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.js"
file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_CSS" file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.css"
file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_HTML" file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.html"
file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_JS" file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.js"
file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_ONC_TYPES_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_ONC_TYPES_JS" file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_types.js"
file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_types.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_HTML" file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.html"
file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_JS" file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.js"
file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.js" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_CSS"
<structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_CSS" file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.css"
file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.css" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_HTML"
<structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_HTML" file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.html"
file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.html" type="chrome_html" />
type="chrome_html" /> <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_JS"
<structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_JS" file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.js"
file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.js" type="chrome_html" />
type="chrome_html" />
</if>
</grit-part> </grit-part>
ui/webui/resources/polymer_resources.grdp
View file @ 41e9150f
This diff is collapsed.
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