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

Merge revision 1474 changes:

Browse Source 
- Windows: Fix VS2012 compile error (issue #1109).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1476 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-10-18 17:28:47 +00:00
parent 261fcd8afa
commit 57f026bb79
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/browser/scheme_handler.cc
View File

@@ -23,13 +23,18 @@ void InstallInternalProtectedHandlers(
content::ProtocolHandlerMap* protocol_handlers,
net::FtpTransactionFactory* ftp_transaction_factory) {
protocol_handlers->insert(
std::make_pair(chrome::kDataScheme, new net::DataProtocolHandler));
std::make_pair(chrome::kDataScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::DataProtocolHandler)));
protocol_handlers->insert(
std::make_pair(chrome::kFileScheme, new net::FileProtocolHandler));
std::make_pair(chrome::kFileScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FileProtocolHandler)));
#if !defined(DISABLE_FTP_SUPPORT)
protocol_handlers->insert(
std::make_pair(chrome::kFtpScheme,
new net::FtpProtocolHandler(ftp_transaction_factory)));
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FtpProtocolHandler(ftp_transaction_factory))));
#endif
for (content::ProtocolHandlerMap::iterator it =