chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 684243002: Fix chrome/ and content/ builds in Windows + BoringSSL.

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/chrome_web_ui_controller_factory.cc

Issue 684243002: Fix chrome/ and content/ builds in Windows + BoringSSL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nacl-fix

Patch Set: Created 6 years, 2 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

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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

index 55ade1b89ccd09bd48f85d78db18e0e8a79612d6..65313a50aac0d2eff80347d87dc200ee696dfd18 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -139,7 +139,7 @@

#include "chrome/browser/ui/webui/set_as_default_browser_ui.h"

#endif

-#if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA)

+#if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)

#include "chrome/browser/ui/webui/certificate_viewer_ui.h"

#endif

@@ -401,7 +401,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

if (url.host() == chrome::kChromeUIMetroFlowHost)

return &NewWebUI<SetAsDefaultBrowserUI>;

#endif

-#if (defined(USE_NSS) || defined(USE_OPENSSL)) && defined(USE_AURA)

+#if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)

if (url.host() == chrome::kChromeUICertificateViewerHost)

return &NewWebUI<CertificateViewerUI>;

#if defined(OS_CHROMEOS)

« no previous file with comments | « no previous file | content/child/webcrypto/openssl/hmac_openssl.cc » ('j') | no next file with comments »