summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.cpp
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.cpp
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.cpp')
-rw-r--r--src/core/content_browser_client_qt.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 232e2d9df..ef034efbc 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -436,3 +436,8 @@ std::string ContentBrowserClientQt::GetApplicationLocale()
{
return QLocale().name().toStdString();
}
+
+content::DevToolsManagerDelegate* ContentBrowserClientQt::GetDevToolsManagerDelegate()
+{
+ return new DevToolsManagerDelegateQt;
+}