Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1454)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 597913004: Condition the ShowManageSSLCertificates button on operating system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 4af7dda304d8210edb1788f4cc73abbabd97e667..0f92504329aec758798d62a604a72c08af98daab 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -701,7 +701,7 @@ void BrowserOptionsHandler::RegisterMessages() {
"defaultZoomFactorAction",
base::Bind(&BrowserOptionsHandler::HandleDefaultZoomFactor,
base::Unretained(this)));
-#if !defined(USE_NSS) && !defined(USE_OPENSSL)
Dan Beam 2014/09/24 18:41:08 why not add a USE_BORINGSSL?
davidben 2014/09/24 18:50:15 The problem isn't OpenSSL -> BoringSSL (all refere
+#if defined(OS_WIN) || defined(OS_MACOSX)
web_ui()->RegisterMessageCallback(
"showManageSSLCertificates",
base::Bind(&BrowserOptionsHandler::ShowManageSSLCertificates,
@@ -1577,7 +1577,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"));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698