chrome/browser/resources/settings/settings_resources.grd - Issue 1838273003: MD Settings: Hooking up native certificate manager.

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

Issue 1838273003: MD Settings: Hooking up native certificate manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Modify ifdefs per feedback Created 4 years, 8 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/privacy_page/privacy_page_browser_proxy.js ('K') | « chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js ('k') | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/BUILD.gn » ('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" />

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

469 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"	469 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"

470 file="privacy_page/privacy_page.html"	470 file="privacy_page/privacy_page.html"

471 type="chrome_html"	471 type="chrome_html"

472 flattenhtml="true"	472 flattenhtml="true"

473 allowexternalscript="true" />	473 allowexternalscript="true" />

474 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"	474 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"

475 file="privacy_page/privacy_page.js"	475 file="privacy_page/privacy_page.js"

476 flattenhtml="true"	476 flattenhtml="true"

477 type="chrome_html" />	477 type="chrome_html" />

	478 <if expr="(not use_nss_certs) and (is_win or is_macosx)">
	Dan Beam 2016/03/31 00:20:57 nit: maybe just "is_win or is_macosx" nit: maybe just "is_win or is_macosx" dpapad 2016/03/31 01:15:03 Done. Show quoted text On 2016/03/31 at 00:20:57, Dan Beam wrote: > nit: maybe just "is_win or is_macosx" Done.
	479 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"

	480 file="privacy_page/privacy_page_browser_proxy.html"

	481 type="chrome_html" />

	482 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"

	483 file="privacy_page/privacy_page_browser_proxy.js"

	484 type="chrome_html" />

	485 </if>

478 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"	486 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"

479 file="settings_page/settings_router.html"	487 file="settings_page/settings_router.html"

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

481 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"	489 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"

482 file="settings_page/settings_router.js"	490 file="settings_page/settings_router.js"

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

484 flattenhtml="true"	492 flattenhtml="true"

485 allowexternalscript="true" />	493 allowexternalscript="true" />

486 <structure name="IDR_SETTINGS_SITE_LIST_CSS"	494 <structure name="IDR_SETTINGS_SITE_LIST_CSS"

487 file="site_settings/site_list.css"	495 file="site_settings/site_list.css"

(...skipping 387 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
875 type="chrome_html"	883 type="chrome_html"

876 flattenhtml="true"	884 flattenhtml="true"

877 allowexternalscript="true" />	885 allowexternalscript="true" />

878 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	886 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

879 file="people_page/users_page.css"	887 file="people_page/users_page.css"

880 type="chrome_html" />	888 type="chrome_html" />

881 </if>	889 </if>

882 </structures>	890 </structures>

883 </release>	891 </release>

884 </grit>	892 </grit>

OLD	NEW