diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-20 16:05:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 10:37:20 +0100 |
| commit | 9a1a09bf82ea98a2b69b351120619c787ce990a8 (patch) | |
| tree | bcd27019991abde6ede6c0fa8480eab1287d522b /src/core/dev_tools_http_handler_delegate_qt.cpp | |
| parent | ba5efed2905de98ed0c9eff3998c270d92a100de (diff) | |
Adapt to API changes in new stable branch 1750
Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp index 6470a60bd..7fa525dc1 100644 --- a/src/core/dev_tools_http_handler_delegate_qt.cpp +++ b/src/core/dev_tools_http_handler_delegate_qt.cpp @@ -47,12 +47,17 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" +#include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_http_handler.h" +#include "content/public/browser/devtools_target.h" +#include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "net/socket/stream_listen_socket.h" #include "net/socket/tcp_listen_socket.h" -DevToolsHttpHandlerDelegateQt::DevToolsHttpHandlerDelegateQt(content::BrowserContext* browser_context) +using namespace content; + +DevToolsHttpHandlerDelegateQt::DevToolsHttpHandlerDelegateQt(BrowserContext* browser_context) : m_browserContext(browser_context) { const int defaultPort = 1337; @@ -65,7 +70,7 @@ DevToolsHttpHandlerDelegateQt::DevToolsHttpHandlerDelegateQt(content::BrowserCon if (base::StringToInt(portString, &portInt) && portInt > 0 && portInt < 65535) listeningPort = portInt; } - m_devtoolsHttpHandler = content::DevToolsHttpHandler::Start(new net::TCPListenSocketFactory("0.0.0.0", listeningPort), std::string(), this); + m_devtoolsHttpHandler = DevToolsHttpHandler::Start(new net::TCPListenSocketFactory("0.0.0.0", listeningPort), std::string(), this); } DevToolsHttpHandlerDelegateQt::~DevToolsHttpHandlerDelegateQt() @@ -100,19 +105,14 @@ std::string DevToolsHttpHandlerDelegateQt::GetPageThumbnailData(const GURL& url) return std::string(); } -content::RenderViewHost* DevToolsHttpHandlerDelegateQt::CreateNewTarget() +scoped_ptr<DevToolsTarget> DevToolsHttpHandlerDelegateQt::CreateNewTarget(const GURL&) { - return NULL; + return scoped_ptr<DevToolsTarget>(); } -content::DevToolsHttpHandlerDelegate::TargetType DevToolsHttpHandlerDelegateQt::GetTargetType(content::RenderViewHost*) +void DevToolsHttpHandlerDelegateQt::EnumerateTargets(TargetCallback callback) { - return kTargetTypeTab; -} - -std::string DevToolsHttpHandlerDelegateQt::GetViewDescription(content::RenderViewHost*) -{ - return std::string(); + callback.Run(TargetList()); } scoped_ptr<net::StreamListenSocket> DevToolsHttpHandlerDelegateQt::CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) |