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

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

Issue 227233006: Make net use v8 through gin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 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 | 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/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 #if !defined(USE_OPENSSL) 94 #if !defined(USE_OPENSSL)
95 #include "net/cert/ct_log_verifier.h" 95 #include "net/cert/ct_log_verifier.h"
96 #include "net/cert/multi_log_ct_verifier.h" 96 #include "net/cert/multi_log_ct_verifier.h"
97 #endif 97 #endif
98 98
99 #if defined(USE_NSS) || defined(OS_IOS) 99 #if defined(USE_NSS) || defined(OS_IOS)
100 #include "net/ocsp/nss_ocsp.h" 100 #include "net/ocsp/nss_ocsp.h"
101 #endif 101 #endif
102 102
103 #if !defined(OS_IOS) && !defined(OS_ANDROID)
104 #include "net/proxy/proxy_resolver_v8.h"
105 #endif
106
107 #if defined(OS_ANDROID) || defined(OS_IOS) 103 #if defined(OS_ANDROID) || defined(OS_IOS)
108 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h" 104 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h"
109 #endif 105 #endif
110 106
111 #if defined(OS_CHROMEOS) 107 #if defined(OS_CHROMEOS)
112 #include "chrome/browser/chromeos/login/user_manager.h" 108 #include "chrome/browser/chromeos/login/user_manager.h"
113 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" 109 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
114 #endif 110 #endif
115 111
116 using content::BrowserThread; 112 using content::BrowserThread;
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 policy::PolicyService* policy_service, 409 policy::PolicyService* policy_service,
414 ChromeNetLog* net_log, 410 ChromeNetLog* net_log,
415 extensions::EventRouterForwarder* extension_event_router_forwarder) 411 extensions::EventRouterForwarder* extension_event_router_forwarder)
416 : net_log_(net_log), 412 : net_log_(net_log),
417 extension_event_router_forwarder_(extension_event_router_forwarder), 413 extension_event_router_forwarder_(extension_event_router_forwarder),
418 globals_(NULL), 414 globals_(NULL),
419 sdch_manager_(NULL), 415 sdch_manager_(NULL),
420 is_spdy_disabled_by_policy_(false), 416 is_spdy_disabled_by_policy_(false),
421 weak_factory_(this), 417 weak_factory_(this),
422 creation_time_(base::TimeTicks::Now()) { 418 creation_time_(base::TimeTicks::Now()) {
423 #if !defined(OS_IOS) && !defined(OS_ANDROID)
424 #if defined(OS_WIN)
425 if (!win8::IsSingleWindowMetroMode())
426 net::ProxyResolverV8::RememberDefaultIsolate();
427 else
428 net::ProxyResolverV8::CreateIsolate();
429 #else
430 net::ProxyResolverV8::RememberDefaultIsolate();
431 #endif
432 #endif
433 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); 419 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes);
434 negotiate_disable_cname_lookup_ = local_state->GetBoolean( 420 negotiate_disable_cname_lookup_ = local_state->GetBoolean(
435 prefs::kDisableAuthNegotiateCnameLookup); 421 prefs::kDisableAuthNegotiateCnameLookup);
436 negotiate_enable_port_ = local_state->GetBoolean( 422 negotiate_enable_port_ = local_state->GetBoolean(
437 prefs::kEnableAuthNegotiatePort); 423 prefs::kEnableAuthNegotiatePort);
438 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); 424 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist);
439 auth_delegate_whitelist_ = local_state->GetString( 425 auth_delegate_whitelist_ = local_state->GetString(
440 prefs::kAuthNegotiateDelegateWhitelist); 426 prefs::kAuthNegotiateDelegateWhitelist);
441 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); 427 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
442 pref_proxy_config_tracker_.reset( 428 pref_proxy_config_tracker_.reset(
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 std::string version_flag = 1220 std::string version_flag =
1235 command_line.GetSwitchValueASCII(switches::kQuicVersion); 1221 command_line.GetSwitchValueASCII(switches::kQuicVersion);
1236 for (size_t i = 0; i < supported_versions.size(); ++i) { 1222 for (size_t i = 0; i < supported_versions.size(); ++i) {
1237 net::QuicVersion version = supported_versions[i]; 1223 net::QuicVersion version = supported_versions[i];
1238 if (net::QuicVersionToString(version) == version_flag) { 1224 if (net::QuicVersionToString(version) == version_flag) {
1239 return version; 1225 return version;
1240 } 1226 }
1241 } 1227 }
1242 return net::QUIC_VERSION_UNSUPPORTED; 1228 return net::QUIC_VERSION_UNSUPPORTED;
1243 } 1229 }
OLDNEW
« no previous file with comments | « chrome/app/android/chrome_android_initializer.cc ('k') | chrome/browser/net/proxy_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698