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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1141603003: Convert cr-settings-main to Polymer 0.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_main/settings_main_style.html ('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: chrome/browser/resources/settings/settings_resources.grd
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index 280fa548615943764e25bd09adfd20c797c4928f..944306238437d3b8981e2c4a6d93a5e40e490140 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -41,8 +41,8 @@
<structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_JS"
file="settings_drawer/settings_drawer.js"
type="chrome_html" />
- <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_STYLE_HTML"
- file="settings_main/settings_main_style.html"
+ <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_CSS"
+ file="settings_main/settings_main.css"
type="chrome_html" />
<structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"
file="settings_main/settings_main.html"
@@ -157,6 +157,9 @@
<structure name="IDR_SETTINGS_SETTINGS_JS"
file="settings.js"
type="chrome_html" />
+ <structure name="IDR_SETTINGS_USE_SHADOW_DOM_JS"
+ file="use_shadow_dom.js"
+ type="chrome_html" />
<if expr="chromeos">
<structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_STYLE_HTML"
file="internet_page/internet_detail_page_style.html"
« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_main/settings_main_style.html ('k') | ui/webui/resources/polymer_resources.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698