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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1214573003: Fix Polymer licensing issues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « tools/polymer/txt_to_polymer_grdp.py ('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 e1ab234e35e02be70b95a09e657da519097e82d2..c737f76db520b06617b8c23adf7919f75e06a9ca 100644
--- a/ui/webui/resources/polymer_resources.grdp
+++ b/ui/webui/resources/polymer_resources.grdp
@@ -495,12 +495,6 @@
<structure name="IDR_POLYMER_POLYMER_POLYMER_JS"
file="../../../third_party/polymer/components-chromium/polymer/polymer.js"
type="chrome_html" />
- <structure name="IDR_POLYMER_WEB_ANIMATIONS_JS_WEB_ANIMATIONS_NEXT_LITE_MIN_JS"
- file="../../../third_party/web-animations-js/sources/web-animations-next-lite.min.js"
- type="chrome_html" />
- <structure name="IDR_POLYMER_WEB_ANIMATIONS_JS_WEB_ANIMATIONS_NEXT_LITE_MIN_JS_MAP"
- file="../../../third_party/web-animations-js/sources/web-animations-next-lite.min.js.map"
- type="chrome_html" />
<!-- Polymer 1.0 -->
<structure name="IDR_POLYMER_1_0_IRON_A11Y_KEYS_BEHAVIOR_IRON_A11Y_KEYS_BEHAVIOR_EXTRACTED_JS"
@@ -566,12 +560,12 @@
<structure name="IDR_POLYMER_1_0_IRON_ICONS_IMAGE_ICONS_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/iron-icons/image-icons.html"
type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_IRON_ICONS_NOTIFICATION_ICONS_HTML"
- file="../../../third_party/polymer/v1_0/components-chromium/iron-icons/notification-icons.html"
- type="chrome_html" />
<structure name="IDR_POLYMER_1_0_IRON_ICONS_IRON_ICONS_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/iron-icons/iron-icons.html"
type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_IRON_ICONS_NOTIFICATION_ICONS_HTML"
+ file="../../../third_party/polymer/v1_0/components-chromium/iron-icons/notification-icons.html"
+ type="chrome_html" />
<structure name="IDR_POLYMER_1_0_IRON_ICON_IRON_ICON_EXTRACTED_JS"
file="../../../third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js"
type="chrome_html" />
@@ -590,18 +584,18 @@
<structure name="IDR_POLYMER_1_0_IRON_MEDIA_QUERY_IRON_MEDIA_QUERY_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/iron-media-query/iron-media-query.html"
type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_IRON_MENU_BEHAVIOR_IRON_MENUBAR_BEHAVIOR_EXTRACTED_JS"
+ file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior-extracted.js"
+ type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_IRON_MENU_BEHAVIOR_IRON_MENUBAR_BEHAVIOR_HTML"
+ file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior.html"
+ type="chrome_html" />
<structure name="IDR_POLYMER_1_0_IRON_MENU_BEHAVIOR_IRON_MENU_BEHAVIOR_EXTRACTED_JS"
file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menu-behavior-extracted.js"
type="chrome_html" />
<structure name="IDR_POLYMER_1_0_IRON_MENU_BEHAVIOR_IRON_MENU_BEHAVIOR_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menu-behavior.html"
type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_IRON_MENUBAR_BEHAVIOR_IRON_MENUBAR_BEHAVIOR_EXTRACTED_JS"
- file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior-extracted.js"
- type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_IRON_MENUBAR_BEHAVIOR_IRON_MENUBAR_BEHAVIOR_HTML"
- file="../../../third_party/polymer/v1_0/components-chromium/iron-menu-behavior/iron-menubar-behavior.html"
- type="chrome_html" />
<structure name="IDR_POLYMER_1_0_IRON_META_IRON_META_EXTRACTED_JS"
file="../../../third_party/polymer/v1_0/components-chromium/iron-meta/iron-meta-extracted.js"
type="chrome_html" />
@@ -1064,16 +1058,7 @@
<structure name="IDR_POLYMER_1_0_PAPER_STYLES_TYPOGRAPHY_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/paper-styles/typography.html"
type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_PAPER_TOGGLE_BUTTON_PAPER_TOGGLE_BUTTON_CSS"
- file="../../../third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.css"
- type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_PAPER_TAB_PAPER_TAB_EXTRACTED_JS"
- file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tab-extracted.js"
- type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_PAPER_TAB_PAPER_TAB_HTML"
- file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tab.html"
- type="chrome_html" />
- <structure name="IDR_POLYMER_1_0_PAPER_TAB_PAPER_TABS_EXTRACTED_JS"
+ <structure name="IDR_POLYMER_1_0_PAPER_TABS_PAPER_TABS_EXTRACTED_JS"
file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tabs-extracted.js"
type="chrome_html" />
<structure name="IDR_POLYMER_1_0_PAPER_TABS_PAPER_TABS_HTML"
@@ -1082,6 +1067,15 @@
<structure name="IDR_POLYMER_1_0_PAPER_TABS_PAPER_TABS_ICONS_HTML"
file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tabs-icons.html"
type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_PAPER_TABS_PAPER_TAB_EXTRACTED_JS"
+ file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tab-extracted.js"
+ type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_PAPER_TABS_PAPER_TAB_HTML"
+ file="../../../third_party/polymer/v1_0/components-chromium/paper-tabs/paper-tab.html"
+ type="chrome_html" />
+ <structure name="IDR_POLYMER_1_0_PAPER_TOGGLE_BUTTON_PAPER_TOGGLE_BUTTON_CSS"
+ file="../../../third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button.css"
+ type="chrome_html" />
<structure name="IDR_POLYMER_1_0_PAPER_TOGGLE_BUTTON_PAPER_TOGGLE_BUTTON_EXTRACTED_JS"
file="../../../third_party/polymer/v1_0/components-chromium/paper-toggle-button/paper-toggle-button-extracted.js"
type="chrome_html" />
@@ -1113,7 +1107,7 @@
file="../../../third_party/polymer/v1_0/components-chromium/polymer/polymer-mini.html"
type="chrome_html" />
<structure name="IDR_POLYMER_1_0_WEB_ANIMATIONS_JS_WEB_ANIMATIONS_NEXT_LITE_MIN_JS"
- file="../../../third_party/polymer/v1_0/components-chromium/web-animations-js/web-animations-next-lite.min.js"
+ file="../../../third_party/web-animations-js/sources/web-animations-next-lite.min.js"
dzhioev (left Google) 2015/06/26 04:18:47 I believe you need to change mappings in shared_re
michaelpg 2015/06/26 04:25:11 Done. (before doing so OOBE crashed, now it doesn'
type="chrome_html" />
</grit-part>
« no previous file with comments | « tools/polymer/txt_to_polymer_grdp.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698