Commit 029701e5 authored by davidben's avatar davidben Committed by Commit bot

Condition the ShowManageSSLCertificates button on operating system.

Excluding USE_OPENSSL is no longer appropriate now that Mac is on OpenSSL/BoringSSL.
(It should have been USE_OPENSSL_CERTS.) Switch them to condition on OS instead to
match the condition in browser_options.js.

BUG=417241
TEST=Manage certificates button in Settings opens Keychain on Mac

Review URL: https://codereview.chromium.org/597913004

Cr-Commit-Position: refs/heads/master@{#296527}
parent 4d1fef58
......@@ -701,7 +701,7 @@ void BrowserOptionsHandler::RegisterMessages() {
"defaultZoomFactorAction",
base::Bind(&BrowserOptionsHandler::HandleDefaultZoomFactor,
base::Unretained(this)));
#if !defined(USE_NSS) && !defined(USE_OPENSSL)
#if defined(OS_WIN) || defined(OS_MACOSX)
web_ui()->RegisterMessageCallback(
"showManageSSLCertificates",
base::Bind(&BrowserOptionsHandler::ShowManageSSLCertificates,
......@@ -1582,7 +1582,7 @@ void BrowserOptionsHandler::ShowNetworkProxySettings(
}
#endif
#if !defined(USE_NSS) && !defined(USE_OPENSSL)
#if defined(OS_WIN) || defined(OS_MACOSX)
void BrowserOptionsHandler::ShowManageSSLCertificates(
const base::ListValue* args) {
content::RecordAction(UserMetricsAction("Options_ManageSSLCertificates"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment