summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2015-01-14 12:19:41 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2015-01-22 16:22:03 +0100
commit9d9268ae1ce34a853b48d3b7189dba6448c38033 (patch)
tree57a070c5b8d9653bdff472b9b98aa5ceacc7909e /src/core/content_browser_client_qt.h
parent9c852a048ebce776fba08a668e4e45251f987d10 (diff)
Fix the inspector after the 40 update
Update our copy of the DevTools code according to the modifications in Chromium 40. Add a DevToolsManagerDelegate subclass to re-add the target enumeration code and import the new shell Target code. Change-Id: I8c56faaf4dd77ca8f4129fcdc80690c7a117464b Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r--src/core/content_browser_client_qt.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 7b5ca49af..0a3acd9cf 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -51,6 +51,7 @@ class URLRequestContextGetter;
namespace content {
class BrowserContext;
class BrowserMainParts;
+class DevToolsManagerDelegate;
class RenderProcessHost;
class RenderViewHostDelegateView;
class ResourceContext;
@@ -103,7 +104,7 @@ public:
bool user_gesture,
const base::Callback<void(bool)>& result_callback) Q_DECL_OVERRIDE;
content::LocationProvider* OverrideSystemLocationProvider() Q_DECL_OVERRIDE;
-
+ content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() Q_DECL_OVERRIDE;
virtual net::URLRequestContextGetter *CreateRequestContext(content::BrowserContext *browser_context, content::ProtocolHandlerMap *protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptorss) Q_DECL_OVERRIDE;
virtual blink::WebNotificationPermission CheckDesktopNotificationPermission(const GURL& source_origin, content::ResourceContext* context, int render_process_id) Q_DECL_OVERRIDE;