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

Unified Diff: net/http/http_auth_handler_factory.cc

Issue 7633006: Linux: control usage of Kerberos via use_kerberos gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dupe Created 9 years, 4 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 | net/http/http_auth_handler_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_handler_factory.cc
diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index 88916f9d4858aca95c56c9a9e62f6e73ea1e032e..fcf2e452d2a252ac23c45655b4650d0f57dcbf3c 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -10,7 +10,9 @@
#include "net/http/http_auth_filter.h"
#include "net/http/http_auth_handler_basic.h"
#include "net/http/http_auth_handler_digest.h"
+#if defined(USE_KERBEROS)
#include "net/http/http_auth_handler_negotiate.h"
+#endif
wtc 2011/08/15 22:43:06 The Chromium Coding Style page recommends that we
Paweł Hajdan Jr. 2011/08/18 17:04:36 Done here: http://codereview.chromium.org/7655046/
#include "net/http/http_auth_handler_ntlm.h"
namespace net {
@@ -49,6 +51,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerFactory::CreateDefault(
registry_factory->RegisterSchemeFactory(
"digest", new HttpAuthHandlerDigest::Factory());
+#if defined(USE_KERBEROS)
HttpAuthHandlerNegotiate::Factory* negotiate_factory =
new HttpAuthHandlerNegotiate::Factory();
#if defined(OS_POSIX)
@@ -58,6 +61,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerFactory::CreateDefault(
#endif
negotiate_factory->set_host_resolver(host_resolver);
registry_factory->RegisterSchemeFactory("negotiate", negotiate_factory);
+#endif // defined(USE_KERBEROS)
HttpAuthHandlerNTLM::Factory* ntlm_factory =
new HttpAuthHandlerNTLM::Factory();
@@ -144,6 +148,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerRegistryFactory::Create(
#endif
registry_factory->RegisterSchemeFactory("ntlm", ntlm_factory);
}
+#if defined(USE_KERBEROS)
if (IsSupportedScheme(supported_schemes, "negotiate")) {
HttpAuthHandlerNegotiate::Factory* negotiate_factory =
new HttpAuthHandlerNegotiate::Factory();
@@ -160,6 +165,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerRegistryFactory::Create(
negotiate_factory->set_use_port(negotiate_enable_port);
registry_factory->RegisterSchemeFactory("negotiate", negotiate_factory);
}
+#endif // defined(USE_KERBEROS)
return registry_factory;
}
« no previous file with comments | « no previous file | net/http/http_auth_handler_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698