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.h | |
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.h')
-rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/dev_tools_http_handler_delegate_qt.h b/src/core/dev_tools_http_handler_delegate_qt.h index 9d9212e6d..be6e97419 100644 --- a/src/core/dev_tools_http_handler_delegate_qt.h +++ b/src/core/dev_tools_http_handler_delegate_qt.h @@ -67,9 +67,10 @@ public: virtual bool BundlesFrontendResources() Q_DECL_OVERRIDE; virtual base::FilePath GetDebugFrontendDir() Q_DECL_OVERRIDE; virtual std::string GetPageThumbnailData(const GURL& url) Q_DECL_OVERRIDE; - virtual content::RenderViewHost* CreateNewTarget() Q_DECL_OVERRIDE; - virtual TargetType GetTargetType(content::RenderViewHost*) Q_DECL_OVERRIDE; - virtual std::string GetViewDescription(content::RenderViewHost*) Q_DECL_OVERRIDE; + virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(const GURL&) Q_DECL_OVERRIDE; + // Requests the list of all inspectable targets. + // The caller gets the ownership of the returned targets. + virtual void EnumerateTargets(TargetCallback callback) Q_DECL_OVERRIDE; virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) Q_DECL_OVERRIDE; private: |