From 3d89cc92faed740c84f7162f3937e391f3df1fa6 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 22 Jul 2014 12:28:31 +0200
Subject: [PATCH] <chromium> 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: Andras Becsi <andras.becsi@digia.com>
---
.../content/browser/tracing/tracing_controller_impl.cc | 2 +-
.../browser/webui/content_web_ui_controller_factory.cc | 4 ++--
chromium/content/content_browser.gypi | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/chromium/content/browser/tracing/tracing_controller_impl.cc b/chromium/content/browser/tracing/tracing_controller_impl.cc
index 63a44fcbcbf..5e6d71377cd 100644
--- a/chromium/content/browser/tracing/tracing_controller_impl.cc
+++ b/chromium/content/browser/tracing/tracing_controller_impl.cc
@@ -907,7 +907,7 @@ void TracingControllerImpl::OnMonitoringStateChanged(bool is_monitoring) {
return;
is_monitoring_ = is_monitoring;
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
for (std::set<TracingUI*>::iterator it = tracing_uis_.begin();
it != tracing_uis_.end(); it++) {
(*it)->OnMonitoringStateChanged(is_monitoring);
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 7a9263111f3..485e95cd0c1 100644
--- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc
+++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc
@@ -24,7 +24,7 @@ namespace content {
WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
BrowserContext* browser_context, const GURL& url) const {
if (url.host() == kChromeUIWebRTCInternalsHost ||
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
url.host() == kChromeUITracingHost ||
#endif
url.host() == kChromeUIGpuHost ||
@@ -59,7 +59,7 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
return new AccessibilityUI(web_ui);
if (url.host() == kChromeUIServiceWorkerInternalsHost)
return new ServiceWorkerInternalsUI(web_ui);
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
if (url.host() == kChromeUITracingHost)
return new TracingUI(web_ui);
#endif
diff --git a/chromium/content/content_browser.gypi b/chromium/content/content_browser.gypi
index bf2500ae229..37aa4673cab 100644
--- a/chromium/content/content_browser.gypi
+++ b/chromium/content/content_browser.gypi
@@ -1536,11 +1536,16 @@
'../sandbox/sandbox.gyp:sandbox',
],
}],
- ['OS!="android" and OS!="ios"', {
+ ['OS!="android" and OS!="ios" and use_qt==0', {
'dependencies': [
'browser/tracing/tracing_resources.gyp:tracing_resources',
],
}],
+ ['use_qt==1', {
+ 'sources!': [
+ 'browser/tracing/tracing_ui.cc',
+ ],
+ }],
['OS!="ios"', {
'dependencies': [
'../third_party/libyuv/libyuv.gyp:libyuv',
--
GitLab