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

Unified Diff: chrome/browser/io_thread.cc

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cbentzel@'s nits Created 5 years, 5 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/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 6d2307533e18f6ff2dcf63dfcf2d1fffd3071c2f..43eb98bc37d1adc677b525b7ddc2698acf059258 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -505,6 +505,8 @@ IOThread::IOThread(
auth_delegate_whitelist_ = local_state->GetString(
prefs::kAuthNegotiateDelegateWhitelist);
gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
+ auth_android_negotiate_account_type_ =
+ local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
pref_proxy_config_tracker_.reset(
ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
local_state));
@@ -1039,6 +1041,8 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
std::string());
registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string());
+ registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType,
+ std::string());
registry->RegisterStringPref(
data_reduction_proxy::prefs::kDataReductionProxy, std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
@@ -1067,9 +1071,9 @@ net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory(
scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory(
net::HttpAuthHandlerRegistryFactory::Create(
- supported_schemes, globals_->url_security_manager.get(),
- resolver, gssapi_library_name_, negotiate_disable_cname_lookup_,
- negotiate_enable_port_));
+ supported_schemes, globals_->url_security_manager.get(), resolver,
+ gssapi_library_name_, auth_android_negotiate_account_type_,
+ negotiate_disable_cname_lookup_, negotiate_enable_port_));
return registry_factory.release();
}

Powered by Google App Engine
This is Rietveld 408576698