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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 9 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 side-by-side diff with in-line comments

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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_resources.grd

diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd

index 835a9fe7ac10d299bcb7acd3e72247e26f51aad3..fbaa5f7dbc0fedba915f0c4636b4ffe9c8782a79 100644

--- a/chrome/browser/resources/settings/settings_resources.grd

+++ b/chrome/browser/resources/settings/settings_resources.grd

@@ -475,6 +475,14 @@

file="privacy_page/privacy_page.js"

flattenhtml="true"

type="chrome_html" />

+ <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"

dpapad 2016/03/31 01:15:03 Done.

+ <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"

+ file="privacy_page/privacy_page_browser_proxy.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"

+ file="privacy_page/privacy_page_browser_proxy.js"

+ type="chrome_html" />

+ </if>

<structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"

file="settings_page/settings_router.html"

type="chrome_html" />