diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 16:28:21 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 17:03:54 +0100 |
| commit | 9621bc201d2db0b14ef45b8f08a85380bd902448 (patch) | |
| tree | b3d48961c9f5a6c61e5255603827e49e3ab73719 /chromium/content | |
| parent | 041b7df767b2af31010cf2972aa9dcb0171b0937 (diff) | |
| download | qtwebengine-chromium-9621bc201d2db0b14ef45b8f08a85380bd902448.tar.gz | |
Do not bundle the tracing UI resources
We do not support loading the chrome://tracing WebUI and therefore
we shouldn't bundle those resources in our library.
Change-Id: If3aa4c676b22a55e772f19487e21b4cd48babe65
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content')
| -rw-r--r-- | chromium/content/browser/BUILD.gn | 6 | ||||
| -rw-r--r-- | chromium/content/browser/webui/content_web_ui_controller_factory.cc | 4 | ||||
| -rw-r--r-- | chromium/content/shell/BUILD.gn | 9 |
3 files changed, 16 insertions, 3 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index 2a1d3041bd4..2376b881518 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -1700,7 +1700,7 @@ source_set("browser") { if (!is_mac) { deps += [ "//sandbox" ] } - if (!is_android) { + if (!is_android && !use_qt) { deps += [ "//components/vector_icons", "//content/browser/tracing:resources", @@ -2266,6 +2266,10 @@ source_set("browser") { } if (use_qt) { + sources -= [ + "tracing/tracing_ui.cc", + "tracing/tracing_ui.h", + ] if (is_win) { sources -= [ "accessibility/browser_accessibility_com_win.cc", diff --git a/chromium/content/browser/webui/content_web_ui_controller_factory.cc b/chromium/content/browser/webui/content_web_ui_controller_factory.cc index e603097af05..02a02de97ff 100644 --- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc +++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc @@ -31,7 +31,7 @@ WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType( return WebUI::kNoWebUI; if (url.host_piece() == kChromeUIWebRTCInternalsHost || -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) url.host_piece() == kChromeUITracingHost || #endif url.host_piece() == kChromeUIGpuHost || @@ -79,7 +79,7 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL( return new ServiceWorkerInternalsUI(web_ui); if (url.host_piece() == kChromeUINetworkErrorsListingHost) return new NetworkErrorsListingUI(web_ui); -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT) if (url.host_piece() == kChromeUITracingHost) return new TracingUI(web_ui); #endif diff --git a/chromium/content/shell/BUILD.gn b/chromium/content/shell/BUILD.gn index 825408259d7..bd04a40d3e8 100644 --- a/chromium/content/shell/BUILD.gn +++ b/chromium/content/shell/BUILD.gn @@ -461,6 +461,15 @@ repack("pak") { "//ui/strings", ] + if (use_qt) { + sources -= [ + "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + ] + deps -= [ + "//content/browser/tracing:resources", + ] + } + if (toolkit_views) { deps += [ "//ui/views/resources" ] sources += |