chrome/browser/resources/settings/settings_resources.grd - Issue 1971483002: MD Settings: About page, porting C++ handler and adding browser proxy.

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

Issue 1971483002: MD Settings: About page, porting C++ handler and adding browser proxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing 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/about_page_browser_proxy.js ('K') | « chrome/browser/resources/settings/about_page/compiled_resources2.gyp ('k') | chrome/browser/ui/webui/settings/about_handler.h » ('j') | chrome/browser/ui/webui/settings/about_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" />

11 <output filename="settings_resources.pak" type="data_package" />	11 <output filename="settings_resources.pak" type="data_package" />

12 </outputs>	12 </outputs>

13 <release seq="1">	13 <release seq="1">

14 <structures>	14 <structures>

15 <structure name="IDR_SETTINGS_A11Y_PAGE_JS"	15 <structure name="IDR_SETTINGS_A11Y_PAGE_JS"

16 file="a11y_page/a11y_page.js"	16 file="a11y_page/a11y_page.js"

17 flattenhtml="true"	17 flattenhtml="true"

18 type="chrome_html" />	18 type="chrome_html" />

19 <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"	19 <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"

20 file="a11y_page/a11y_page.html"	20 file="a11y_page/a11y_page.html"

21 type="chrome_html"	21 type="chrome_html"

22 flattenhtml="true"	22 flattenhtml="true"

23 allowexternalscript="true" />	23 allowexternalscript="true" />

	24 <structure name="IDR_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_HTML"

	25 file="about_page/about_page_browser_proxy.html"

	26 type="chrome_html" />

	27 <structure name="IDR_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_JS"

	28 file="about_page/about_page_browser_proxy.js"

	29 type="chrome_html"

	30 flattenhtml="true" />

24 <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"	31 <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"

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

26 type="chrome_html" />	33 type="chrome_html" />

27 <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"	34 <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"

28 file="about_page/about_page.html"	35 file="about_page/about_page.html"

29 type="chrome_html"	36 type="chrome_html"

30 flattenhtml="true"	37 flattenhtml="true"

31 allowexternalscript="true" />	38 allowexternalscript="true" />

32 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"	39 <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"

33 file="site_settings/add_site_dialog.html"	40 file="site_settings/add_site_dialog.html"

(...skipping 913 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
947 type="chrome_html"	954 type="chrome_html"

948 flattenhtml="true"	955 flattenhtml="true"

949 allowexternalscript="true" />	956 allowexternalscript="true" />

950 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	957 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

951 file="people_page/users_page.css"	958 file="people_page/users_page.css"

952 type="chrome_html" />	959 type="chrome_html" />

953 </if>	960 </if>

954 </structures>	961 </structures>

955 </release>	962 </release>

956 </grit>	963 </grit>

OLD	NEW