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

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

Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Android Created 5 years, 8 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
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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 prefs::kAuthNegotiateDelegateWhitelist); 533 prefs::kAuthNegotiateDelegateWhitelist);
534 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 534 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
535 pref_proxy_config_tracker_.reset( 535 pref_proxy_config_tracker_.reset(
536 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 536 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
537 local_state)); 537 local_state));
538 ChromeNetworkDelegate::InitializePrefsOnUIThread( 538 ChromeNetworkDelegate::InitializePrefsOnUIThread(
539 &system_enable_referrers_, 539 &system_enable_referrers_,
540 NULL, 540 NULL,
541 NULL, 541 NULL,
542 NULL, 542 NULL,
543 NULL,
544 local_state); 543 local_state);
545 ssl_config_service_manager_.reset( 544 ssl_config_service_manager_.reset(
546 SSLConfigServiceManager::CreateDefaultManager(local_state)); 545 SSLConfigServiceManager::CreateDefaultManager(local_state));
547 546
548 base::Value* dns_client_enabled_default = new base::FundamentalValue( 547 base::Value* dns_client_enabled_default = new base::FundamentalValue(
549 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); 548 chrome_browser_net::ConfigureAsyncDnsFieldTrial());
550 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, 549 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
551 dns_client_enabled_default); 550 dns_client_enabled_default);
552 chrome_browser_net::LogAsyncDnsPrefSource( 551 chrome_browser_net::LogAsyncDnsPrefSource(
553 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); 552 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled));
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1600 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1602 for (size_t i = 0; i < supported_versions.size(); ++i) { 1601 for (size_t i = 0; i < supported_versions.size(); ++i) {
1603 net::QuicVersion version = supported_versions[i]; 1602 net::QuicVersion version = supported_versions[i];
1604 if (net::QuicVersionToString(version) == quic_version) { 1603 if (net::QuicVersionToString(version) == quic_version) {
1605 return version; 1604 return version;
1606 } 1605 }
1607 } 1606 }
1608 1607
1609 return net::QUIC_VERSION_UNSUPPORTED; 1608 return net::QUIC_VERSION_UNSUPPORTED;
1610 } 1609 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_api_unittest.cc ('k') | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698