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

Update to Chromium revision 184577.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1111 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-27 17:56:03 +00:00
parent d9a4c5690b
commit c10f203620
24 changed files with 93 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/browser/scheme_impl.cc
View File

@@ -39,7 +39,7 @@
#include "net/url_request/url_request_ftp_job.h"
#include "net/url_request/url_request_http_job.h"
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_job_factory.h"
#include "net/url_request/url_request_job_factory_impl.h"
using net::URLRequestStatus;
@@ -124,11 +124,9 @@ class CefUrlRequestManager {
// Retrieve the singleton instance.
static CefUrlRequestManager* GetInstance();
net::URLRequestJobFactory* GetJobFactory() {
return const_cast<net::URLRequestJobFactory*>(
static_cast<CefURLRequestContextGetter*>(
_Context->request_context().get())->
GetURLRequestContext()->job_factory());
net::URLRequestJobFactoryImpl* GetJobFactoryImpl() {
return static_cast<CefURLRequestContextGetter*>(
_Context->request_context().get())->job_factory_impl();
}
bool AddFactory(const std::string& scheme,
@@ -150,7 +148,7 @@ class CefUrlRequestManager {
handler_map_[make_pair(scheme_lower, domain_lower)] = factory;
net::URLRequestJobFactory* job_factory = GetJobFactory();
net::URLRequestJobFactoryImpl* job_factory = GetJobFactoryImpl();
job_factory->SetProtocolHandler(scheme_lower,
new ProtocolHandler(scheme_lower));
@@ -178,7 +176,7 @@ class CefUrlRequestManager {
void ClearFactories() {
CEF_REQUIRE_IOT();
net::URLRequestJobFactory* job_factory = GetJobFactory();
net::URLRequestJobFactoryImpl* job_factory = GetJobFactoryImpl();
// Unregister with the ProtocolFactory.
std::set<std::string> schemes;