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

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

Issue 11186002: Add a SafeSearch preference, policy and implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased with the latest tree version Created 8 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
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/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 prefs::kEnableAuthNegotiatePort); 355 prefs::kEnableAuthNegotiatePort);
356 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); 356 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
357 auth_delegate_whitelist_ = local_state->GetString( 357 auth_delegate_whitelist_ = local_state->GetString(
358 prefs::kAuthNegotiateDelegateWhitelist); 358 prefs::kAuthNegotiateDelegateWhitelist);
359 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 359 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
360 pref_proxy_config_tracker_.reset( 360 pref_proxy_config_tracker_.reset(
361 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); 361 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state));
362 ChromeNetworkDelegate::InitializePrefsOnUIThread( 362 ChromeNetworkDelegate::InitializePrefsOnUIThread(
363 &system_enable_referrers_, 363 &system_enable_referrers_,
364 NULL, 364 NULL,
365 NULL,
365 local_state); 366 local_state);
366 ssl_config_service_manager_.reset( 367 ssl_config_service_manager_.reset(
367 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL)); 368 SSLConfigServiceManager::CreateDefaultManager(local_state, NULL));
368 369
369 BrowserThread::SetDelegate(BrowserThread::IO, this); 370 BrowserThread::SetDelegate(BrowserThread::IO, this);
370 } 371 }
371 372
372 IOThread::~IOThread() { 373 IOThread::~IOThread() {
373 // This isn't needed for production code, but in tests, IOThread may 374 // This isn't needed for production code, but in tests, IOThread may
374 // be multiply constructed. 375 // be multiply constructed.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 extension_event_router_forwarder_; 431 extension_event_router_forwarder_;
431 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( 432 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate(
432 extension_event_router_forwarder_, 433 extension_event_router_forwarder_,
433 NULL, 434 NULL,
434 NULL, 435 NULL,
435 NULL, 436 NULL,
436 NULL, 437 NULL,
437 NULL, 438 NULL,
438 &system_enable_referrers_, 439 &system_enable_referrers_,
439 NULL, 440 NULL,
441 NULL,
440 NULL); 442 NULL);
441 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling)) 443 if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling))
442 network_delegate->NeverThrottleRequests(); 444 network_delegate->NeverThrottleRequests();
443 globals_->system_network_delegate.reset(network_delegate); 445 globals_->system_network_delegate.reset(network_delegate);
444 globals_->host_resolver = CreateGlobalHostResolver(net_log_); 446 globals_->host_resolver = CreateGlobalHostResolver(net_log_);
445 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); 447 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault());
446 globals_->transport_security_state.reset(new net::TransportSecurityState()); 448 globals_->transport_security_state.reset(new net::TransportSecurityState());
447 globals_->ssl_config_service = GetSSLConfigService(); 449 globals_->ssl_config_service = GetSSLConfigService();
448 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) { 450 if (command_line.HasSwitch(switches::kSpdyProxyOrigin)) {
449 spdyproxy_origin_ = 451 spdyproxy_origin_ =
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 new net::HttpNetworkLayer( 730 new net::HttpNetworkLayer(
729 new net::HttpNetworkSession(system_params))); 731 new net::HttpNetworkSession(system_params)));
730 globals_->system_ftp_transaction_factory.reset( 732 globals_->system_ftp_transaction_factory.reset(
731 new net::FtpNetworkLayer(globals_->host_resolver.get())); 733 new net::FtpNetworkLayer(globals_->host_resolver.get()));
732 globals_->system_request_context.reset( 734 globals_->system_request_context.reset(
733 ConstructSystemRequestContext(globals_, net_log_)); 735 ConstructSystemRequestContext(globals_, net_log_));
734 736
735 sdch_manager_->set_sdch_fetcher( 737 sdch_manager_->set_sdch_fetcher(
736 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); 738 new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
737 } 739 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698