chrome/browser/resources/settings/settings_resources.grd - Issue 2339853003: MD Settings: Fix Reset profile dialog scenario that causes a crash.

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

Issue 2339853003: MD Settings: Fix Reset profile dialog scenario that causes a crash. (Closed)

Patch Set: Nit Created 4 years, 3 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:

« no previous file with comments | « chrome/browser/resources/settings/reset_page/reset_profile_dialog.js ('k') | chrome/test/data/webui/settings/reset_page_test.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 466 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
477 type="chrome_html" />	477 type="chrome_html" />

478 <structure name="IDR_SETTINGS_POWERWASH_DIALOG_JS"	478 <structure name="IDR_SETTINGS_POWERWASH_DIALOG_JS"

479 file="reset_page/powerwash_dialog.js"	479 file="reset_page/powerwash_dialog.js"

480 type="chrome_html" />	480 type="chrome_html" />

481 <structure name="IDR_SETTINGS_RESET_PAGE_HTML"	481 <structure name="IDR_SETTINGS_RESET_PAGE_HTML"

482 file="reset_page/reset_page.html"	482 file="reset_page/reset_page.html"

483 type="chrome_html"	483 type="chrome_html"

484 preprocess="true" />	484 preprocess="true" />

485 <structure name="IDR_SETTINGS_RESET_PAGE_JS"	485 <structure name="IDR_SETTINGS_RESET_PAGE_JS"

486 file="reset_page/reset_page.js"	486 file="reset_page/reset_page.js"

	487 preprocess="true"

487 type="chrome_html" />	488 type="chrome_html" />

488 <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_HTML"	489 <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_HTML"

489 file="reset_page/reset_profile_dialog.html"	490 file="reset_page/reset_profile_dialog.html"

490 type="chrome_html" />	491 type="chrome_html" />

491 <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_JS"	492 <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_JS"

492 file="reset_page/reset_profile_dialog.js"	493 file="reset_page/reset_profile_dialog.js"

493 type="chrome_html" />	494 type="chrome_html" />

494 <structure name="IDR_SETTINGS_RESET_PROFILE_BANNER_HTML"	495 <structure name="IDR_SETTINGS_RESET_PROFILE_BANNER_HTML"

495 file="reset_page/reset_profile_banner.html"	496 file="reset_page/reset_profile_banner.html"

496 type="chrome_html" />	497 type="chrome_html" />

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

1121 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1122 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1122 file="people_page/users_page.html"	1123 file="people_page/users_page.html"

1123 type="chrome_html"	1124 type="chrome_html"

1124 flattenhtml="true"	1125 flattenhtml="true"

1125 allowexternalscript="true" />	1126 allowexternalscript="true" />

1126 </if>	1127 </if>

1127 </structures>	1128 </structures>

1128 </release>	1129 </release>

1129 </grit>	1130 </grit>

OLD	NEW