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

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

Issue 818193005: Removing HTTP Auth related command-line flags "--enable-auth-negotiate-port" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing Build errors 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 #if defined(ENABLE_EXTENSIONS) 476 #if defined(ENABLE_EXTENSIONS)
477 extension_event_router_forwarder_(extension_event_router_forwarder), 477 extension_event_router_forwarder_(extension_event_router_forwarder),
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(
487 prefs::kEnableAuthNegotiatePort);
488 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); 486 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
489 auth_delegate_whitelist_ = local_state->GetString( 487 auth_delegate_whitelist_ = local_state->GetString(
490 prefs::kAuthNegotiateDelegateWhitelist); 488 prefs::kAuthNegotiateDelegateWhitelist);
491 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 489 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
492 pref_proxy_config_tracker_.reset( 490 pref_proxy_config_tracker_.reset(
493 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 491 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
494 local_state)); 492 local_state));
495 ChromeNetworkDelegate::InitializePrefsOnUIThread( 493 ChromeNetworkDelegate::InitializePrefsOnUIThread(
496 &system_enable_referrers_, 494 &system_enable_referrers_,
497 NULL, 495 NULL,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 } 954 }
957 } 955 }
958 } 956 }
959 957
960 // static 958 // static
961 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { 959 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
962 registry->RegisterStringPref(prefs::kAuthSchemes, 960 registry->RegisterStringPref(prefs::kAuthSchemes,
963 "basic,digest,ntlm,negotiate," 961 "basic,digest,ntlm,negotiate,"
964 "spdyproxy"); 962 "spdyproxy");
965 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); 963 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false);
966 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false);
967 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); 964 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
968 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, 965 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
969 std::string()); 966 std::string());
970 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); 967 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string());
971 registry->RegisterStringPref( 968 registry->RegisterStringPref(
972 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); 969 data_reduction_proxy::prefs::kDataReductionProxy, std::string());
973 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); 970 registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
974 data_reduction_proxy::RegisterPrefs(registry); 971 data_reduction_proxy::RegisterPrefs(registry);
975 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); 972 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
976 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); 973 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1458 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1462 for (size_t i = 0; i < supported_versions.size(); ++i) { 1459 for (size_t i = 0; i < supported_versions.size(); ++i) {
1463 net::QuicVersion version = supported_versions[i]; 1460 net::QuicVersion version = supported_versions[i];
1464 if (net::QuicVersionToString(version) == quic_version) { 1461 if (net::QuicVersionToString(version) == quic_version) {
1465 return version; 1462 return version;
1466 } 1463 }
1467 } 1464 }
1468 1465
1469 return net::QUIC_VERSION_UNSUPPORTED; 1466 return net::QUIC_VERSION_UNSUPPORTED;
1470 } 1467 }
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