diff options
| author | jlklein <jlklein@chromium.org> | 2015-05-01 12:35:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 19:36:19 +0000 |
| commit | f0c5abbfb8e955069a64a8bfd52fbe4dc7a38522 (patch) | |
| tree | 01588062dd8387da4044ba8859159f4f6e247393 /ui/webui/resources/polymer_resources.grdp | |
| parent | c155d75ee1a50b8e9f4139f16e72297f753526d0 (diff) | |
| download | chromium_src-f0c5abbfb8e955069a64a8bfd52fbe4dc7a38522.zip chromium_src-f0c5abbfb8e955069a64a8bfd52fbe4dc7a38522.tar.gz chromium_src-f0c5abbfb8e955069a64a8bfd52fbe4dc7a38522.tar.bz2 | |
Add a build flag to include polymer 0.8 in the binary
BUG=483080
Review URL: https://codereview.chromium.org/1118673004
Cr-Commit-Position: refs/heads/master@{#327959}
Diffstat (limited to 'ui/webui/resources/polymer_resources.grdp')
| -rw-r--r-- | ui/webui/resources/polymer_resources.grdp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/ui/webui/resources/polymer_resources.grdp b/ui/webui/resources/polymer_resources.grdp index 2af362c..5886972 100644 --- a/ui/webui/resources/polymer_resources.grdp +++ b/ui/webui/resources/polymer_resources.grdp @@ -475,29 +475,31 @@ file="../../../third_party/web-animations-js/sources/web-animations-next-lite.min.js.map" type="chrome_html" /> - <!-- Polymer 0.8 Elements, --> - <structure name="IDR_POLYMER_08_POLYMER_POLYMER_HTML" - file="../../../third_party/polymer/v0_8/components-chromium/polymer/polymer.html" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_POLYMER_POLYMER_JS" - file="../../../third_party/polymer/v0_8/components-chromium/polymer/polymer.js" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_CSS" - file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox.css" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_EXTRACTED_JS" - file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox-extracted.js" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_HTML" - file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox.html" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_RIPPLE_PAPER_RIPPLE_EXTRACTED_JS" - file="../../../third_party/polymer/v0_8/components-chromium/paper-ripple/paper-ripple-extracted.js" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_RIPPLE_PAPER_RIPPLE_HTML" - file="../../../third_party/polymer/v0_8/components-chromium/paper-ripple/paper-ripple.html" - type="chrome_html" /> - <structure name="IDR_POLYMER_08_PAPER_STYLES_DEFAULT_THEME_HTML" - file="../../../third_party/polymer/v0_8/components-chromium/paper-styles/default-theme.html" - type="chrome_html" /> + <!-- Polymer 0.8 --> + <if expr="enable_polymer_v08"> + <structure name="IDR_POLYMER_08_POLYMER_POLYMER_HTML" + file="../../../third_party/polymer/v0_8/components-chromium/polymer/polymer.html" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_POLYMER_POLYMER_JS" + file="../../../third_party/polymer/v0_8/components-chromium/polymer/polymer.js" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_CSS" + file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox.css" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_EXTRACTED_JS" + file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox-extracted.js" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_CHECKBOX_PAPER_CHECKBOX_HTML" + file="../../../third_party/polymer/v0_8/components-chromium/paper-checkbox/paper-checkbox.html" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_RIPPLE_PAPER_RIPPLE_EXTRACTED_JS" + file="../../../third_party/polymer/v0_8/components-chromium/paper-ripple/paper-ripple-extracted.js" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_RIPPLE_PAPER_RIPPLE_HTML" + file="../../../third_party/polymer/v0_8/components-chromium/paper-ripple/paper-ripple.html" + type="chrome_html" /> + <structure name="IDR_POLYMER_08_PAPER_STYLES_DEFAULT_THEME_HTML" + file="../../../third_party/polymer/v0_8/components-chromium/paper-styles/default-theme.html" + type="chrome_html" /> + </if> </grit-part> |