diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-20 12:53:40 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-20 11:42:06 +0000 |
| commit | 1f8630df0b982e344aac5c5f1faadf647255ecb5 (patch) | |
| tree | a6ac5df6377db896621ea404ffecbee13d84bebd | |
| parent | 3b9138ebe86c853ff84edc245f2d331f96ff2e93 (diff) | |
FIXUP: Fixup Chrome WebUI sources to work with Qtv5.10.0-beta2
Remove more references to remote frontend paths we are not using, and
which gets optimized away in release builds anyway.
Change-Id: I49e2c822dbc193bbb6936201823fb9ffdd877f8e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/chrome/browser/ui/webui/devtools_ui.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/chrome/browser/ui/webui/devtools_ui.cc b/chromium/chrome/browser/ui/webui/devtools_ui.cc index 84c54740fd5..79b5ed083b3 100644 --- a/chromium/chrome/browser/ui/webui/devtools_ui.cc +++ b/chromium/chrome/browser/ui/webui/devtools_ui.cc @@ -327,6 +327,7 @@ void DevToolsDataSource::OnURLFetchComplete(const net::URLFetcher* source) { // static GURL DevToolsUI::GetProxyURL(const std::string& frontend_url) { +#ifndef TOOLKIT_QT GURL url(frontend_url); if (url.scheme() == content::kChromeDevToolsScheme && url.host() == chrome::kChromeUIDevToolsHost) @@ -338,15 +339,22 @@ GURL DevToolsUI::GetProxyURL(const std::string& frontend_url) { chrome::kChromeUIDevToolsHost, chrome::kChromeUIDevToolsRemotePath, url.path().substr(1).c_str())); +#else + return GURL(); +#endif } // static GURL DevToolsUI::GetRemoteBaseURL() { +#ifndef TOOLKIT_QT return GURL(base::StringPrintf( "%s%s/%s/", kRemoteFrontendBase, kRemoteFrontendPath, content::GetWebKitRevision().c_str())); +#else + return GURL(); +#endif } DevToolsUI::DevToolsUI(content::WebUI* web_ui) |