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

Unified Diff: ui/webui/resources/polymer_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/webui/resources/cr_elements_resources.grdp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/polymer_resources.grdp
diff --git a/ui/webui/resources/polymer_resources.grdp b/ui/webui/resources/polymer_resources.grdp
index a7e8f8222d8f859536374bbb26a7b6aa1c6a885d..2ab069a69e2e27bd559249ec598ffdcb984c1b06 100644
--- a/ui/webui/resources/polymer_resources.grdp
+++ b/ui/webui/resources/polymer_resources.grdp
@@ -439,29 +439,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>
« no previous file with comments | « ui/webui/resources/cr_elements_resources.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698