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

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

Issue 4560001: Support specifying the GSSAPI library that will be used. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix another compile error on Windows Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/policy/configuration_policy_pref_store.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 // sure that everything is initialized in the right order. 222 // sure that everything is initialized in the right order.
223 RegisterPrefs(local_state); 223 RegisterPrefs(local_state);
224 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); 224 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
225 negotiate_disable_cname_lookup_ = local_state->GetBoolean( 225 negotiate_disable_cname_lookup_ = local_state->GetBoolean(
226 prefs::kDisableAuthNegotiateCnameLookup); 226 prefs::kDisableAuthNegotiateCnameLookup);
227 negotiate_enable_port_ = local_state->GetBoolean( 227 negotiate_enable_port_ = local_state->GetBoolean(
228 prefs::kEnableAuthNegotiatePort); 228 prefs::kEnableAuthNegotiatePort);
229 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); 229 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
230 auth_delegate_whitelist_ = local_state->GetString( 230 auth_delegate_whitelist_ = local_state->GetString(
231 prefs::kAuthNegotiateDelegateWhitelist); 231 prefs::kAuthNegotiateDelegateWhitelist);
232 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
232 } 233 }
233 234
234 IOThread::~IOThread() { 235 IOThread::~IOThread() {
235 // We cannot rely on our base class to stop the thread since we want our 236 // We cannot rely on our base class to stop the thread since we want our
236 // CleanUp function to run. 237 // CleanUp function to run.
237 Stop(); 238 Stop();
238 DCHECK(!globals_); 239 DCHECK(!globals_);
239 } 240 }
240 241
241 IOThread::Globals* IOThread::globals() { 242 IOThread::Globals* IOThread::globals() {
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 422
422 // static 423 // static
423 void IOThread::RegisterPrefs(PrefService* local_state) { 424 void IOThread::RegisterPrefs(PrefService* local_state) {
424 local_state->RegisterStringPref(prefs::kAuthSchemes, 425 local_state->RegisterStringPref(prefs::kAuthSchemes,
425 "basic,digest,ntlm,negotiate"); 426 "basic,digest,ntlm,negotiate");
426 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, 427 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup,
427 false); 428 false);
428 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); 429 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false);
429 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); 430 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, "");
430 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); 431 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, "");
432 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, "");
431 } 433 }
432 434
433 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( 435 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory(
434 net::HostResolver* resolver) { 436 net::HostResolver* resolver) {
435 437
436 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = 438 net::HttpAuthFilterWhitelist* auth_filter_default_credentials =
437 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); 439 new net::HttpAuthFilterWhitelist(auth_server_whitelist_);
438 net::HttpAuthFilterWhitelist* auth_filter_delegate = 440 net::HttpAuthFilterWhitelist* auth_filter_delegate =
439 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); 441 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_);
440 globals_->url_security_manager.reset( 442 globals_->url_security_manager.reset(
441 net::URLSecurityManager::Create(auth_filter_default_credentials, 443 net::URLSecurityManager::Create(auth_filter_default_credentials,
442 auth_filter_delegate)); 444 auth_filter_delegate));
443 std::vector<std::string> supported_schemes; 445 std::vector<std::string> supported_schemes;
444 base::SplitString(auth_schemes_, ',', &supported_schemes); 446 base::SplitString(auth_schemes_, ',', &supported_schemes);
445 447
446 return net::HttpAuthHandlerRegistryFactory::Create( 448 return net::HttpAuthHandlerRegistryFactory::Create(
447 supported_schemes, 449 supported_schemes,
448 globals_->url_security_manager.get(), 450 globals_->url_security_manager.get(),
449 resolver, 451 resolver,
452 gssapi_library_name_,
450 negotiate_disable_cname_lookup_, 453 negotiate_disable_cname_lookup_,
451 negotiate_enable_port_); 454 negotiate_enable_port_);
452 } 455 }
453 456
454 void IOThread::InitNetworkPredictorOnIOThread( 457 void IOThread::InitNetworkPredictorOnIOThread(
455 bool prefetching_enabled, 458 bool prefetching_enabled,
456 base::TimeDelta max_dns_queue_delay, 459 base::TimeDelta max_dns_queue_delay,
457 size_t max_speculative_parallel_resolves, 460 size_t max_speculative_parallel_resolves,
458 const chrome_common_net::UrlList& startup_urls, 461 const chrome_common_net::UrlList& startup_urls,
459 ListValue* referral_list, 462 ListValue* referral_list,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 net::HostCache* host_cache = 494 net::HostCache* host_cache =
492 globals_->host_resolver.get()->GetAsHostResolverImpl()->cache(); 495 globals_->host_resolver.get()->GetAsHostResolverImpl()->cache();
493 if (host_cache) 496 if (host_cache)
494 host_cache->clear(); 497 host_cache->clear();
495 } 498 }
496 // Clear all of the passively logged data. 499 // Clear all of the passively logged data.
497 // TODO(eroman): this is a bit heavy handed, really all we need to do is 500 // TODO(eroman): this is a bit heavy handed, really all we need to do is
498 // clear the data pertaining to off the record context. 501 // clear the data pertaining to off the record context.
499 globals_->net_log->passive_collector()->Clear(); 502 globals_->net_log->passive_collector()->Clear();
500 } 503 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/policy/configuration_policy_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698