summaryrefslogtreecommitdiffstats
path: root/net/http/http_auth_handler_factory.cc
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 12:38:19 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 12:38:19 +0000
commit1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c (patch)
treecdad2f08fdc26c5a15ec7e45609717d829a2ccd5 /net/http/http_auth_handler_factory.cc
parentb69f4ffd2ff73ba0cad80f80555e4b15fc211257 (diff)
downloadchromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.zip
chromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.tar.gz
chromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.tar.bz2
Revert 97925 - Linux: allow linking directly with Kerberos instead of using dlopen.
dlopen is still the default for Google Chrome. This option is intended for Linux distro packagers. BUG=92689 Review URL: http://codereview.chromium.org/7655046 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/7719024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_handler_factory.cc')
-rw-r--r--net/http/http_auth_handler_factory.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index 6a6b574..fcf2e45 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -10,11 +10,10 @@
#include "net/http/http_auth_filter.h"
#include "net/http/http_auth_handler_basic.h"
#include "net/http/http_auth_handler_digest.h"
-#include "net/http/http_auth_handler_ntlm.h"
-
#if defined(USE_KERBEROS)
#include "net/http/http_auth_handler_negotiate.h"
#endif
+#include "net/http/http_auth_handler_ntlm.h"
namespace net {