chrome/browser/resources/settings/settings_resources.grd - Issue 2010653003: MD Settings: About page, implementing channel switcher dialog.

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

Issue 2010653003: MD Settings: About page, implementing channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 7 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/about_page/detailed_build_info.html ('K') | « chrome/browser/resources/settings/about_page/detailed_build_info.html ('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">	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 20 matching lines...) Expand all Loading...
31 <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"	31 <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"

32 file="about_page/about_page.js"	32 file="about_page/about_page.js"

33 type="chrome_html"	33 type="chrome_html"

34 flattenhtml="true" />	34 flattenhtml="true" />

35 <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"	35 <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"

36 file="about_page/about_page.html"	36 file="about_page/about_page.html"

37 type="chrome_html"	37 type="chrome_html"

38 flattenhtml="true"	38 flattenhtml="true"

39 allowexternalscript="true" />	39 allowexternalscript="true" />

40 <if expr="chromeos">	40 <if expr="chromeos">

	41 <structure name="IDR_SETTINGS_CHANNEL_SWITCHER_DIALOG_HTML"

	42 file="about_page/channel_switcher_dialog.html"

	43 type="chrome_html" />

	44 <structure name="IDR_SETTINGS_CHANNEL_SWITCHER_DIALOG_JS"

	45 file="about_page/channel_switcher_dialog.js"

	46 type="chrome_html" />

41 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_JS"	47 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_JS"

42 file="about_page/detailed_build_info.js"	48 file="about_page/detailed_build_info.js"

43 type="chrome_html" />	49 type="chrome_html" />

44 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_HTML"	50 <structure name="IDR_SETTINGS_DETAILED_BUILD_INFO_HTML"

45 file="about_page/detailed_build_info.html"	51 file="about_page/detailed_build_info.html"

46 type="chrome_html" />	52 type="chrome_html" />

47 </if>	53 </if>

48 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"	54 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"

49 file="site_settings/add_site_dialog.html"	55 file="site_settings/add_site_dialog.html"

50 type="chrome_html" />	56 type="chrome_html" />

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

885 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	891 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

886 file="people_page/users_page.html"	892 file="people_page/users_page.html"

887 type="chrome_html"	893 type="chrome_html"

888 flattenhtml="true"	894 flattenhtml="true"

889 allowexternalscript="true" />	895 allowexternalscript="true" />

890 </if>	896 </if>

891 </structures>	897 </structures>

892 </release>	898 </release>

893 </grit>	899 </grit>

OLD	NEW