chrome/browser/ui/webui/settings/md_settings_ui.cc - 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/ui/webui/settings/md_settings_ui.cc

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

Patch Set: Addressing comments 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

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/settings/native_certificates_handler.h » ('j') | chrome/browser/ui/webui/settings/native_certificates_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index 035e5e8499118b04ade80ff321f80c750e548f46..87e178a1e74192b16dfa2137249c889ad5300402 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -41,6 +41,8 @@

#if defined(USE_NSS_CERTS)

#include "chrome/browser/ui/webui/settings/certificates_handler.h"

+#elif defined(OS_WIN) || defined(OS_MACOSX)

Dan Beam 2016/03/31 04:22:33 still too many spaces before OS_WIN

dpapad 2016/03/31 17:44:11 Done.

+#include "chrome/browser/ui/webui/settings/native_certificates_handler.h"

#endif // defined(USE_NSS_CERTS)

namespace settings {

@@ -53,6 +55,8 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

#if defined(USE_NSS_CERTS)

AddSettingsPageUIHandler(new CertificatesHandler(false));

+#elif defined(OS_WIN) || defined(OS_MACOSX)

Dan Beam 2016/03/31 04:22:33 and here

dpapad 2016/03/31 17:44:11 Done.

+ AddSettingsPageUIHandler(new NativeCertificatesHandler());

#endif // defined(USE_NSS_CERTS)

AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));