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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 832423003: Removing the auth related command line option auth-server-whitelist (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 #endif 478 #endif
479 globals_(NULL), 479 globals_(NULL),
480 is_spdy_disabled_by_policy_(false), 480 is_spdy_disabled_by_policy_(false),
481 creation_time_(base::TimeTicks::Now()), 481 creation_time_(base::TimeTicks::Now()),
482 weak_factory_(this) { 482 weak_factory_(this) {
483 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); 483 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
484 negotiate_disable_cname_lookup_ = local_state->GetBoolean( 484 negotiate_disable_cname_lookup_ = local_state->GetBoolean(
485 prefs::kDisableAuthNegotiateCnameLookup); 485 prefs::kDisableAuthNegotiateCnameLookup);
486 negotiate_enable_port_ = local_state->GetBoolean( 486 negotiate_enable_port_ = local_state->GetBoolean(
487 prefs::kEnableAuthNegotiatePort); 487 prefs::kEnableAuthNegotiatePort);
488 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
489 auth_delegate_whitelist_ = local_state->GetString( 488 auth_delegate_whitelist_ = local_state->GetString(
490 prefs::kAuthNegotiateDelegateWhitelist); 489 prefs::kAuthNegotiateDelegateWhitelist);
491 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 490 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
492 pref_proxy_config_tracker_.reset( 491 pref_proxy_config_tracker_.reset(
493 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 492 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
494 local_state)); 493 local_state));
495 ChromeNetworkDelegate::InitializePrefsOnUIThread( 494 ChromeNetworkDelegate::InitializePrefsOnUIThread(
496 &system_enable_referrers_, 495 &system_enable_referrers_,
497 NULL, 496 NULL,
498 NULL, 497 NULL,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 } 956 }
958 } 957 }
959 958
960 // static 959 // static
961 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { 960 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
962 registry->RegisterStringPref(prefs::kAuthSchemes, 961 registry->RegisterStringPref(prefs::kAuthSchemes,
963 "basic,digest,ntlm,negotiate," 962 "basic,digest,ntlm,negotiate,"
964 "spdyproxy"); 963 "spdyproxy");
965 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); 964 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false);
966 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); 965 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false);
967 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
968 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, 966 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
969 std::string()); 967 std::string());
970 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); 968 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string());
971 registry->RegisterStringPref( 969 registry->RegisterStringPref(
972 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); 970 data_reduction_proxy::prefs::kDataReductionProxy, std::string());
973 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); 971 registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
974 data_reduction_proxy::RegisterPrefs(registry); 972 data_reduction_proxy::RegisterPrefs(registry);
975 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); 973 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
976 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); 974 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
977 } 975 }
978 976
979 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( 977 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory(
980 net::HostResolver* resolver) { 978 net::HostResolver* resolver) {
981 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; 979 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL;
982 if (!auth_server_whitelist_.empty()) {
983 auth_filter_default_credentials =
984 new net::HttpAuthFilterWhitelist(auth_server_whitelist_);
985 }
986 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; 980 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL;
987 if (!auth_delegate_whitelist_.empty()) { 981 if (!auth_delegate_whitelist_.empty()) {
988 auth_filter_delegate = 982 auth_filter_delegate =
989 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); 983 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_);
990 } 984 }
991 globals_->url_security_manager.reset( 985 globals_->url_security_manager.reset(
992 net::URLSecurityManager::Create(auth_filter_default_credentials, 986 net::URLSecurityManager::Create(auth_filter_default_credentials,
993 auth_filter_delegate)); 987 auth_filter_delegate));
994 std::vector<std::string> supported_schemes; 988 std::vector<std::string> supported_schemes;
995 base::SplitString(auth_schemes_, ',', &supported_schemes); 989 base::SplitString(auth_schemes_, ',', &supported_schemes);
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1455 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1462 for (size_t i = 0; i < supported_versions.size(); ++i) { 1456 for (size_t i = 0; i < supported_versions.size(); ++i) {
1463 net::QuicVersion version = supported_versions[i]; 1457 net::QuicVersion version = supported_versions[i];
1464 if (net::QuicVersionToString(version) == quic_version) { 1458 if (net::QuicVersionToString(version) == quic_version) {
1465 return version; 1459 return version;
1466 } 1460 }
1467 } 1461 }
1468 1462
1469 return net::QUIC_VERSION_UNSUPPORTED; 1463 return net::QUIC_VERSION_UNSUPPORTED;
1470 } 1464 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698