chrome/browser/resources/settings/settings_resources.grd - Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page

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

Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page (Closed)

Patch Set: rebase Created 4 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:

« no previous file with comments | « chrome/browser/resources/settings/settings_page/main_page_behavior.js ('k') | chrome/test/data/webui/settings/advanced_page_browsertest.js » ('j') | no next file with comments »
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" output_all_resource_defines= "false">	2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">

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 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_HTML"	58 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_HTML"

59 file="about_page/detailed_build_info.html"	59 file="about_page/detailed_build_info.html"

60 type="chrome_html" />	60 type="chrome_html" />

61 </if>	61 </if>

62 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"	62 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"

63 file="site_settings/add_site_dialog.html"	63 file="site_settings/add_site_dialog.html"

64 type="chrome_html" />	64 type="chrome_html" />

65 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_JS"	65 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_JS"

66 file="site_settings/add_site_dialog.js"	66 file="site_settings/add_site_dialog.js"

67 type="chrome_html" />	67 type="chrome_html" />

68 <structure name="IDR_SETTINGS_ADVANCED_PAGE_JS"

69 file="advanced_page/advanced_page.js"

70 flattenhtml="true"

71 type="chrome_html" />

72 <structure name="IDR_SETTINGS_ADVANCED_PAGE_HTML"

73 file="advanced_page/advanced_page.html"

74 type="chrome_html"

75 flattenhtml="true"

76 allowexternalscript="true" />

77 <structure name="IDR_SETTINGS_ALL_SITES_HTML"	68 <structure name="IDR_SETTINGS_ALL_SITES_HTML"

78 file="site_settings/all_sites.html"	69 file="site_settings/all_sites.html"

79 type="chrome_html" />	70 type="chrome_html" />

80 <structure name="IDR_SETTINGS_ALL_SITES_JS"	71 <structure name="IDR_SETTINGS_ALL_SITES_JS"

81 file="site_settings/all_sites.js"	72 file="site_settings/all_sites.js"

82 type="chrome_html" />	73 type="chrome_html" />

83 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_HTML"	74 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_HTML"

84 file="animation/animation.html"	75 file="animation/animation.html"

85 type="chrome_html" />	76 type="chrome_html" />

86 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_JS"	77 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_JS"

(...skipping 29 matching lines...) Expand all Loading...
116 file="appearance_page/appearance_page.html"	107 file="appearance_page/appearance_page.html"

117 type="chrome_html"	108 type="chrome_html"

118 flattenhtml="true"	109 flattenhtml="true"

119 allowexternalscript="true" />	110 allowexternalscript="true" />

120 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"	111 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"

121 file="appearance_page/appearance_page.js"	112 file="appearance_page/appearance_page.js"

122 type="chrome_html"	113 type="chrome_html"

123 flattenhtml="true" />	114 flattenhtml="true" />

124 <structure name="IDR_SETTINGS_BASIC_PAGE_JS"	115 <structure name="IDR_SETTINGS_BASIC_PAGE_JS"

125 file="basic_page/basic_page.js"	116 file="basic_page/basic_page.js"

	117 flattenhtml="true"

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

127 <structure name="IDR_SETTINGS_BASIC_PAGE_HTML"	119 <structure name="IDR_SETTINGS_BASIC_PAGE_HTML"

128 file="basic_page/basic_page.html"	120 file="basic_page/basic_page.html"

129 type="chrome_html"	121 type="chrome_html"

130 flattenhtml="true"	122 flattenhtml="true"

131 allowexternalscript="true" />	123 allowexternalscript="true" />

132 <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_JS"	124 <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_JS"

133 file="extension_control_browser_proxy.js"	125 file="extension_control_browser_proxy.js"

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

135 <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_HTML"	127 <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_HTML"

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

1204 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1196 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1205 file="people_page/users_page.html"	1197 file="people_page/users_page.html"

1206 type="chrome_html"	1198 type="chrome_html"

1207 flattenhtml="true"	1199 flattenhtml="true"

1208 allowexternalscript="true" />	1200 allowexternalscript="true" />

1209 </if>	1201 </if>

1210 </structures>	1202 </structures>

1211 </release>	1203 </release>

1212 </grit>	1204 </grit>

OLD	NEW