bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcef: Update due to underlying chromium changes.

Browse Source 
- WebKit API changes.
- Use net::ProxyConfigService in BrowserRequestContext.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@61 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2009-10-25 19:29:12 +00:00
parent 5186e4a223
commit dc602cd0a4
7 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser_request_context.cc
View File

@@ -12,6 +12,8 @@
#include "net/base/host_resolver.h"
#include "net/base/ssl_config_service.h"
#include "net/ftp/ftp_network_layer.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_config_service_fixed.h"
#include "net/proxy/proxy_service.h"
#include "webkit/glue/webkit_glue.h"
@@ -36,10 +38,12 @@ void BrowserRequestContext::Init(
accept_language_ = "en-us,en";
accept_charset_ = "iso-8859-1,*,utf-8";
net::ProxyConfig proxy_config;
// Use the system proxy settings.
scoped_ptr<net::ProxyConfigService> proxy_config_service(
net::ProxyService::CreateSystemProxyConfigService(NULL, NULL));
host_resolver_ = net::CreateSystemHostResolver();
proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL,
false, NULL, NULL, NULL);
proxy_service_ = net::ProxyService::Create(proxy_config_service.release(),
false, NULL, NULL);
ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
net::HttpCache *cache;