chrome/browser/resources/settings/settings_resources.grd - Issue 1869883003: MD Settings: On Startup, extract dialog to its own file.

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

Issue 1869883003: MD Settings: On Startup, extract dialog to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Typo Created 4 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 unified diff | Download patch

« chrome/browser/resources/settings/on_startup_page/startup_url_dialog.js ('K') | « chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc » ('j') | chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc » ('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 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 type="chrome_html" />	91 type="chrome_html" />

92 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_JS"	92 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_JS"

93 file="on_startup_page/startup_urls_page.js"	93 file="on_startup_page/startup_urls_page.js"

94 type="chrome_html" />	94 type="chrome_html" />

95 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_JS"	95 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_JS"

96 file="on_startup_page/startup_urls_page_browser_proxy.js"	96 file="on_startup_page/startup_urls_page_browser_proxy.js"

97 type="chrome_html" />	97 type="chrome_html" />

98 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_HTML"	98 <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_HTML"

99 file="on_startup_page/startup_urls_page_browser_proxy.html"	99 file="on_startup_page/startup_urls_page_browser_proxy.html"

100 type="chrome_html" />	100 type="chrome_html" />

	101 <structure name="IDR_SETTINGS_STARTUP_URL_DIALOG_JS"

	102 file="on_startup_page/startup_url_dialog.js"

	103 type="chrome_html" />

	104 <structure name="IDR_SETTINGS_STARTUP_URL_DIALOG_HTML"

	105 file="on_startup_page/startup_url_dialog.html"

	106 type="chrome_html"

	107 flattenhtml="true"
	Dan Beam 2016/04/08 23:24:42 flattenhtml="true" is only need for <if> or <inclu flattenhtml="true" is only need for <if> or <include>, don't use it otherwise dpapad 2016/04/09 00:02:18 Done. Show quoted text On 2016/04/08 at 23:24:42, Dan Beam wrote: > flattenhtml="true" is only need for <if> or <include>, don't use it otherwise Done.
	108 allowexternalscript="true" />

101 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_CSS"	109 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_CSS"

102 file="settings_main/settings_main.css"	110 file="settings_main/settings_main.css"

103 type="chrome_html" />	111 type="chrome_html" />

104 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"	112 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"

105 file="settings_main/settings_main.html"	113 file="settings_main/settings_main.html"

106 type="chrome_html"	114 type="chrome_html"

107 flattenhtml="true"	115 flattenhtml="true"

108 allowexternalscript="true" />	116 allowexternalscript="true" />

109 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS"	117 <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS"

110 file="settings_main/settings_main.js"	118 file="settings_main/settings_main.js"

(...skipping 787 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
898 type="chrome_html"	906 type="chrome_html"

899 flattenhtml="true"	907 flattenhtml="true"

900 allowexternalscript="true" />	908 allowexternalscript="true" />

901 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	909 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

902 file="people_page/users_page.css"	910 file="people_page/users_page.css"

903 type="chrome_html" />	911 type="chrome_html" />

904 </if>	912 </if>

905 </structures>	913 </structures>

906 </release>	914 </release>

907 </grit>	915 </grit>

OLD	NEW