Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1009)

Unified Diff: ui/webui/resources/cr_elements_resources.grdp

Issue 1118673004: Add a build flag to include polymer 0.8 in the binary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to enable_polymer_v08 and ensure it works with the default Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/resources/ui_resources.gyp ('k') | ui/webui/resources/polymer_resources.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6c44a4204b9c2059bfcc804fe589731bd2c6ba2f..bad164f013cb764216fbd7bdd0917ebb44611a55 100644
--- a/ui/webui/resources/cr_elements_resources.grdp
+++ b/ui/webui/resources/cr_elements_resources.grdp
@@ -104,13 +104,15 @@
type="chrome_html" />
<!-- Polymer 0.8 Elements -->
- <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" />
+ <if expr="enable_polymer_v08">
+ <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" />
+ </if>
</grit-part>
« no previous file with comments | « ui/resources/ui_resources.gyp ('k') | ui/webui/resources/polymer_resources.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698