diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-06 20:56:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-20 11:05:27 +0100 |
| commit | c86631a070b423ea594ca860c05b7ce7c87d82e0 (patch) | |
| tree | df63dd51ae0d18bac501ac9ba1b8352854db1947 /src/core/dev_tools_http_handler_delegate_qt.cpp | |
| parent | 39a0d09358a8cae4a3d65ed13b81a810355571e5 (diff) | |
Adapt to chromium API changes in refs/branch-heads/1650
This patch also updates src/3rparty to the new snapshot.
Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/dev_tools_http_handler_delegate_qt.cpp')
| -rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp index 0603f5dcc..f71f56726 100644 --- a/src/core/dev_tools_http_handler_delegate_qt.cpp +++ b/src/core/dev_tools_http_handler_delegate_qt.cpp @@ -102,7 +102,7 @@ std::string DevToolsHttpHandlerDelegateQt::GetViewDescription(content::RenderVie return std::string(); } -scoped_refptr<net::StreamListenSocket> DevToolsHttpHandlerDelegateQt::CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) +scoped_ptr<net::StreamListenSocket> DevToolsHttpHandlerDelegateQt::CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) { - return NULL; + return scoped_ptr<net::StreamListenSocket>(); } |