bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1474 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-10-18 17:27:17 +00:00
parent 6a52564668
commit f248b937f9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/browser/scheme_handler.cc
View File

@ -25,16 +25,21 @@ void InstallInternalProtectedHandlers(
content::ProtocolHandlerMap* protocol_handlers, content::ProtocolHandlerMap* protocol_handlers,
net::FtpTransactionFactory* ftp_transaction_factory) { net::FtpTransactionFactory* ftp_transaction_factory) {
protocol_handlers->insert( 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( protocol_handlers->insert(
std::make_pair(chrome::kFileScheme, new net::FileProtocolHandler( std::make_pair(chrome::kFileScheme,
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FileProtocolHandler(
content::BrowserThread::GetBlockingPool()-> content::BrowserThread::GetBlockingPool()->
GetTaskRunnerWithShutdownBehavior( GetTaskRunnerWithShutdownBehavior(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))); base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))));
#if !defined(DISABLE_FTP_SUPPORT) #if !defined(DISABLE_FTP_SUPPORT)
protocol_handlers->insert( protocol_handlers->insert(
std::make_pair(chrome::kFtpScheme, std::make_pair(chrome::kFtpScheme,
new net::FtpProtocolHandler(ftp_transaction_factory))); linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
new net::FtpProtocolHandler(ftp_transaction_factory))));
#endif #endif
for (content::ProtocolHandlerMap::iterator it = for (content::ProtocolHandlerMap::iterator it =