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

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

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 5 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 | 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); 391 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
392 negotiate_disable_cname_lookup_ = local_state->GetBoolean( 392 negotiate_disable_cname_lookup_ = local_state->GetBoolean(
393 prefs::kDisableAuthNegotiateCnameLookup); 393 prefs::kDisableAuthNegotiateCnameLookup);
394 negotiate_enable_port_ = local_state->GetBoolean( 394 negotiate_enable_port_ = local_state->GetBoolean(
395 prefs::kEnableAuthNegotiatePort); 395 prefs::kEnableAuthNegotiatePort);
396 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); 396 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
397 auth_delegate_whitelist_ = local_state->GetString( 397 auth_delegate_whitelist_ = local_state->GetString(
398 prefs::kAuthNegotiateDelegateWhitelist); 398 prefs::kAuthNegotiateDelegateWhitelist);
399 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 399 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
400 pref_proxy_config_tracker_.reset( 400 pref_proxy_config_tracker_.reset(
401 ProxyServiceFactory::CreatePrefProxyConfigTracker(local_state)); 401 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
402 local_state));
402 ChromeNetworkDelegate::InitializePrefsOnUIThread( 403 ChromeNetworkDelegate::InitializePrefsOnUIThread(
403 &system_enable_referrers_, 404 &system_enable_referrers_,
404 NULL, 405 NULL,
405 NULL, 406 NULL,
406 local_state); 407 local_state);
407 ssl_config_service_manager_.reset( 408 ssl_config_service_manager_.reset(
408 SSLConfigServiceManager::CreateDefaultManager(local_state)); 409 SSLConfigServiceManager::CreateDefaultManager(local_state));
409 410
410 base::Value* dns_client_enabled_default = new base::FundamentalValue( 411 base::Value* dns_client_enabled_default = new base::FundamentalValue(
411 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); 412 chrome_browser_net::ConfigureAsyncDnsFieldTrial());
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 if (command_line.HasSwitch(switches::kDisableQuic)) 967 if (command_line.HasSwitch(switches::kDisableQuic))
967 return false; 968 return false;
968 969
969 if (command_line.HasSwitch(switches::kEnableQuic) || 970 if (command_line.HasSwitch(switches::kEnableQuic) ||
970 command_line.HasSwitch(switches::kEnableQuicHttps)) { 971 command_line.HasSwitch(switches::kEnableQuicHttps)) {
971 return true; 972 return true;
972 } 973 }
973 974
974 return quic_trial_group == kQuicFieldTrialEnabledGroupName; 975 return quic_trial_group == kQuicFieldTrialEnabledGroupName;
975 } 976 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.cc ('k') | chrome/browser/net/proxy_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698