diff --git a/chromium/content/browser/tracing/tracing_controller_impl.cc b/chromium/content/browser/tracing/tracing_controller_impl.cc index 63a44fcbcbf41c00c31f78ce4bfc1ac09f7ffe5a..5e6d71377cd28f18670b4fae885c77e44e3dfe35 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 7a9263111f395e7b593854366e3c836851ec4fac..485e95cd0c193d2e8d53a1259251a9429681102c 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 bf2500ae229ad1250a606f97bbec6b50ac169a51..37aa4673cab1b8ac6085f3f9c6a07003a3009a1b 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',