Index: ui/webui/resources/cr_elements_resources.grdp |
diff --git a/ui/webui/resources/cr_elements_resources.grdp b/ui/webui/resources/cr_elements_resources.grdp |
index bc5ac369436dd02010f3b4dcc875da96cf199803..120e8dd027e5cd0b5f6b6f37efed02f31aa112c7 100644 |
--- a/ui/webui/resources/cr_elements_resources.grdp |
+++ b/ui/webui/resources/cr_elements_resources.grdp |
@@ -1,5 +1,6 @@ |
<?xml version="1.0" encoding="utf-8"?> |
<grit-part> |
+ <!-- Polymer 0.5 Elements (TODO: Remove by M45 branch point) --> |
<structure name="IDR_CR_ELEMENTS_CR_BUTTON_CSS" |
file="../../webui/resources/cr_elements/cr_button/cr_button.css" |
type="chrome_html" /> |
@@ -104,84 +105,82 @@ |
type="chrome_html" /> |
<!-- Polymer 0.8 Elements --> |
- <if expr="enable_polymer_v08"> |
- <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_HTML" |
- file="../../webui/resources/cr_elements/v0_8/demo_element.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_JS" |
- file="../../webui/resources/cr_elements/v0_8/demo_element.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_PAGE_HTML" |
- file="../../webui/resources/cr_elements/v0_8/demo_page.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.css" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.css" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.css" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.css" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.css" |
- type="chrome_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" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_ONC_TYPES_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_types.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_HTML" |
- file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.html" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.js" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_CSS" |
- file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.css" |
- type="chrome_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" |
- type="chrome_html" /> |
- <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_JS" |
- file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.js" |
- type="chrome_html" /> |
- </if> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/demo_element.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_JS" |
+ file="../../webui/resources/cr_elements/v0_8/demo_element.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_PAGE_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/demo_page.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.css" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_BUTTON_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_button/cr_button.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.css" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_CHECKBOX_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_checkbox/cr_checkbox.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.css" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_COLLAPSE_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_collapse/cr_collapse.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_EVENTS_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_events/cr_events.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.css" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_INPUT_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_input/cr_input.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.css" |
+ type="chrome_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" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_NETWORK_ICON_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_ONC_TYPES_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_types.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_HTML" |
+ file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.html" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_ONC_DATA_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data.js" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_CSS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.css" |
+ type="chrome_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" |
+ type="chrome_html" /> |
+ <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_JS" |
+ file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.js" |
+ type="chrome_html" /> |
</grit-part> |