chrome/browser/resources/settings/settings_resources.grd - Issue 2500653002: MD Settings: Add import data dialog.

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

Issue 2500653002: MD Settings: Add import data dialog. (Closed)

Patch Set: Fix bad merge Created 4 years, 1 month 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/people_page/people_page.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('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 618 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
629 file="people_page/people_page.html"	629 file="people_page/people_page.html"

630 type="chrome_html"	630 type="chrome_html"

631 flattenhtml="true"	631 flattenhtml="true"

632 allowexternalscript="true" />	632 allowexternalscript="true" />

633 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"	633 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"

634 file="people_page/people_page.js"	634 file="people_page/people_page.js"

635 type="chrome_html"	635 type="chrome_html"

636 flattenhtml="true"	636 flattenhtml="true"

637 allowexternalscript="true" />	637 allowexternalscript="true" />

638 <if expr="not chromeos">	638 <if expr="not chromeos">

	639 <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_HTML"

	640 file="people_page/import_data_dialog.html"

	641 type="chrome_html" />

	642 <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_JS"

	643 file="people_page/import_data_dialog.js"

	644 type="chrome_html" />

	645 <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_HTML "

	646 file="people_page/import_data_browser_proxy.html"

	647 type="chrome_html" />

	648 <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_JS"

	649 file="people_page/import_data_browser_proxy.js"

	650 type="chrome_html" />

639 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"	651 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"

640 file="people_page/manage_profile.html"	652 file="people_page/manage_profile.html"

641 type="chrome_html"	653 type="chrome_html"

642 flattenhtml="true"	654 flattenhtml="true"

643 allowexternalscript="true" />	655 allowexternalscript="true" />

644 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"	656 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"

645 file="people_page/manage_profile.js"	657 file="people_page/manage_profile.js"

646 type="chrome_html" />	658 type="chrome_html" />

647 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_H TML"	659 <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_H TML"

648 file="people_page/manage_profile_browser_proxy.html"	660 file="people_page/manage_profile_browser_proxy.html"

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

1150 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1162 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1151 file="people_page/users_page.html"	1163 file="people_page/users_page.html"

1152 type="chrome_html"	1164 type="chrome_html"

1153 flattenhtml="true"	1165 flattenhtml="true"

1154 allowexternalscript="true" />	1166 allowexternalscript="true" />

1155 </if>	1167 </if>

1156 </structures>	1168 </structures>

1157 </release>	1169 </release>

1158 </grit>	1170 </grit>

OLD	NEW