mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Printing fix was committed as Chromium rev 23338, so the patches are no longer required. - Add a patch for plugin loading support that was broken in Chromium rev 23501. - NPAPI::PluginList static methods are replaced with methods provided by the singleton instance. - WebPreferences now has an Apply() method. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@35 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -6,8 +6,15 @@
|
||||
#include "precompiled_libcef.h"
|
||||
#include "browser_request_context.h"
|
||||
|
||||
#include "build/build_config.h"
|
||||
|
||||
#include "net/base/cookie_monster.h"
|
||||
#include "net/base/host_resolver.h"
|
||||
#if defined(OS_WIN)
|
||||
#include "net/base/ssl_config_service_win.h"
|
||||
#else
|
||||
#include "net/base/ssl_config_service_defaults.h"
|
||||
#endif
|
||||
#include "net/ftp/ftp_network_layer.h"
|
||||
#include "net/proxy/proxy_service.h"
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
@@ -37,12 +44,19 @@ void BrowserRequestContext::Init(
|
||||
host_resolver_ = net::CreateSystemHostResolver();
|
||||
proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL,
|
||||
false, NULL, NULL);
|
||||
#if defined(OS_WIN)
|
||||
ssl_config_service_ = new net::SSLConfigServiceWin;
|
||||
#else
|
||||
ssl_config_service_ = new net::SSLConfigServiceDefaults;
|
||||
#endif
|
||||
|
||||
net::HttpCache *cache;
|
||||
if (cache_path.empty()) {
|
||||
cache = new net::HttpCache(host_resolver_, proxy_service_, 0);
|
||||
cache = new net::HttpCache(host_resolver_, proxy_service_,
|
||||
ssl_config_service_, 0);
|
||||
} else {
|
||||
cache = new net::HttpCache(host_resolver_, proxy_service_, cache_path, 0);
|
||||
cache = new net::HttpCache(host_resolver_, proxy_service_,
|
||||
ssl_config_service_, cache_path, 0);
|
||||
}
|
||||
cache->set_mode(cache_mode);
|
||||
http_transaction_factory_ = cache;
|
||||
@@ -54,7 +68,6 @@ BrowserRequestContext::~BrowserRequestContext() {
|
||||
delete cookie_store_;
|
||||
delete ftp_transaction_factory_;
|
||||
delete http_transaction_factory_;
|
||||
delete proxy_service_;
|
||||
}
|
||||
|
||||
const std::string& BrowserRequestContext::GetUserAgent(
|
||||
|
Reference in New Issue
Block a user