OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_tracker.h" | 10 #include "base/debug/leak_tracker.h" |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 // static | 568 // static |
569 void IOThread::RegisterPrefs(PrefService* local_state) { | 569 void IOThread::RegisterPrefs(PrefService* local_state) { |
570 local_state->RegisterStringPref(prefs::kAuthSchemes, | 570 local_state->RegisterStringPref(prefs::kAuthSchemes, |
571 "basic,digest,ntlm,negotiate"); | 571 "basic,digest,ntlm,negotiate"); |
572 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, | 572 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, |
573 false); | 573 false); |
574 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 574 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
575 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); | 575 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); |
576 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); | 576 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); |
577 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, ""); | 577 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, ""); |
| 578 local_state->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); |
578 local_state->RegisterBooleanPref(prefs::kEnableReferrers, true); | 579 local_state->RegisterBooleanPref(prefs::kEnableReferrers, true); |
579 } | 580 } |
580 | 581 |
581 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 582 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
582 net::HostResolver* resolver) { | 583 net::HostResolver* resolver) { |
583 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 584 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
584 if (!auth_server_whitelist_.empty()) { | 585 if (!auth_server_whitelist_.empty()) { |
585 auth_filter_default_credentials = | 586 auth_filter_default_credentials = |
586 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 587 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
587 } | 588 } |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 system_params.network_delegate = globals_->system_network_delegate.get(); | 691 system_params.network_delegate = globals_->system_network_delegate.get(); |
691 system_params.net_log = net_log_; | 692 system_params.net_log = net_log_; |
692 globals_->system_http_transaction_factory.reset( | 693 globals_->system_http_transaction_factory.reset( |
693 new net::HttpNetworkLayer( | 694 new net::HttpNetworkLayer( |
694 new net::HttpNetworkSession(system_params))); | 695 new net::HttpNetworkSession(system_params))); |
695 globals_->system_ftp_transaction_factory.reset( | 696 globals_->system_ftp_transaction_factory.reset( |
696 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 697 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
697 globals_->system_request_context = | 698 globals_->system_request_context = |
698 ConstructSystemRequestContext(globals_, net_log_); | 699 ConstructSystemRequestContext(globals_, net_log_); |
699 } | 700 } |
OLD | NEW |