chrome/browser/resources/settings/settings_resources.grd - Issue 1509913004: [MD settings] moving dialog css to shared to use in OnStartup and Reset settings

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1509913004: [MD settings] moving dialog css to shared to use in OnStartup and Reset settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master Created 5 years 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 unified diff | Download patch

« chrome/browser/resources/settings/settings_dialog.css ('K') | « chrome/browser/resources/settings/settings_dialog.css ('k') | chrome/browser/resources/settings/settings_shared.css » ('j') | chrome/browser/resources/settings/settings_shared.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 type="chrome_html" />	120 type="chrome_html" />

121 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_CSS"	121 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_CSS"

122 file="settings_page/settings_subheader.css"	122 file="settings_page/settings_subheader.css"

123 type="chrome_html" />	123 type="chrome_html" />

124 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_HTML"	124 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_HTML"

125 file="settings_page/settings_subheader.html"	125 file="settings_page/settings_subheader.html"

126 type="chrome_html" />	126 type="chrome_html" />

127 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_JS"	127 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_JS"

128 file="settings_page/settings_subheader.js"	128 file="settings_page/settings_subheader.js"

129 type="chrome_html" />	129 type="chrome_html" />

	130 <structure name="IDR_SETTINGS_CR_SETTINGS_DIALOG_CSS"

	131 file="settings_dialog.css"

	132 type="chrome_html" />

130 <structure name="IDR_SETTINGS_CR_SETTINGS_SHARED_CSS"	133 <structure name="IDR_SETTINGS_CR_SETTINGS_SHARED_CSS"

131 file="settings_shared.css"	134 file="settings_shared.css"

132 type="chrome_html" />	135 type="chrome_html" />

133 <structure name="IDR_SETTINGS_BREADCRUMB_CSS"	136 <structure name="IDR_SETTINGS_BREADCRUMB_CSS"

134 file="settings_ui/breadcrumb.css"	137 file="settings_ui/breadcrumb.css"

135 type="chrome_html" />	138 type="chrome_html" />

136 <structure name="IDR_SETTINGS_BREADCRUMB_HTML"	139 <structure name="IDR_SETTINGS_BREADCRUMB_HTML"

137 file="settings_ui/breadcrumb.html"	140 file="settings_ui/breadcrumb.html"

138 type="chrome_html"	141 type="chrome_html"

139 flattenhtml="true"	142 flattenhtml="true"

(...skipping 513 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
653 type="chrome_html"	656 type="chrome_html"

654 flattenhtml="true"	657 flattenhtml="true"

655 allowexternalscript="true" />	658 allowexternalscript="true" />

656 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	659 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

657 file="users_page/users_page.css"	660 file="users_page/users_page.css"

658 type="chrome_html" />	661 type="chrome_html" />

659 </if>	662 </if>

660 </structures>	663 </structures>

661 </release>	664 </release>

662 </grit>	665 </grit>

OLD	NEW