diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-30 17:23:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:17 +0000 |
| commit | d5bffb5125da23718e8098441b4a4269a5cf2f33 (patch) | |
| tree | 48a39ba7f833116cba7dcc7917d13d34a062949c /src/core/devtools_manager_delegate_qt.cpp | |
| parent | 789f375411b542db3ac3be79cbe0a6153720abf1 (diff) | |
Basic adaptations for 64-based
Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/devtools_manager_delegate_qt.cpp')
| -rw-r--r-- | src/core/devtools_manager_delegate_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/devtools_manager_delegate_qt.cpp b/src/core/devtools_manager_delegate_qt.cpp index 305e32278..e926a818f 100644 --- a/src/core/devtools_manager_delegate_qt.cpp +++ b/src/core/devtools_manager_delegate_qt.cpp @@ -49,7 +49,6 @@ #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/grit/qt_webengine_resources.h" #include "content/browser/devtools/devtools_http_handler.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_frontend_host.h" @@ -65,6 +64,8 @@ #include "net/socket/tcp_server_socket.h" #include "ui/base/resource/resource_bundle.h" +#include "qtwebengine/grit/qt_webengine_resources.h" + #include "type_conversion.h" using content::DevToolsAgentHost; @@ -180,7 +181,7 @@ void DevToolsManagerDelegateQt::Initialized(const net::IPEndPoint *ip_address) std::string DevToolsManagerDelegateQt::GetDiscoveryPageHTML() { - return ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); + return ui::ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); } std::string DevToolsManagerDelegateQt::GetFrontendResource(const std::string& path) |