chrome/browser/ui/webui/options/options_ui.cc - Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS.

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/options/options_ui.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs

Patch Set: rebase Created 5 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:

Index: chrome/browser/ui/webui/options/options_ui.cc

diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc

index ce2b00fd30f290f795895335d04c7195cb4bd6f8..9b576d7a1aa364d997b391da0d0397ae9153431f 100644

--- a/chrome/browser/ui/webui/options/options_ui.cc

+++ b/chrome/browser/ui/webui/options/options_ui.cc

@@ -97,7 +97,7 @@

#include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"

#endif

-#if defined(USE_NSS)

+#if defined(USE_NSS_CERTS)

#include "chrome/browser/ui/webui/options/certificate_manager_handler.h"

#endif

@@ -347,7 +347,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)

new chromeos::options::ConsumerManagementHandler(consumer_management);

AddOptionsPageUIHandler(localized_strings, consumer_management_handler);

#endif

-#if defined(USE_NSS)

+#if defined(USE_NSS_CERTS)

AddOptionsPageUIHandler(localized_strings,

new CertificateManagerHandler(false));

#endif