From 57f026bb79fd29e2378b1a3a8edb9609874855d8 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 18 Oct 2013 17:28:47 +0000 Subject: [PATCH] Merge revision 1474 changes: - Windows: Fix VS2012 compile error (issue #1109). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1476 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser/scheme_handler.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libcef/browser/scheme_handler.cc b/libcef/browser/scheme_handler.cc index 207d3b5c6..8c9ec77e3 100644 --- a/libcef/browser/scheme_handler.cc +++ b/libcef/browser/scheme_handler.cc @@ -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( + new net::DataProtocolHandler))); protocol_handlers->insert( - std::make_pair(chrome::kFileScheme, new net::FileProtocolHandler)); + std::make_pair(chrome::kFileScheme, + linked_ptr( + new net::FileProtocolHandler))); #if !defined(DISABLE_FTP_SUPPORT) protocol_handlers->insert( std::make_pair(chrome::kFtpScheme, - new net::FtpProtocolHandler(ftp_transaction_factory))); + linked_ptr( + new net::FtpProtocolHandler(ftp_transaction_factory)))); #endif for (content::ProtocolHandlerMap::iterator it =