diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-03 13:19:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-03 17:29:43 +0100 |
| commit | 7eb6adb6cac7c604d4717bd3ab0f0e8cca452fe5 (patch) | |
| tree | 5218647eee4c52fad271362896e49c11ef1a1658 /chromium/chrome/browser/ui | |
| parent | 0199422d32f37be484483a523f7e88a3e1def4f2 (diff) | |
| download | qtwebengine-chromium-7eb6adb6cac7c604d4717bd3ab0f0e8cca452fe5.tar.gz | |
Bring enable_webrtc back
Returns the GN args and BUILDFLAG to disable WebRTC code
shrinking the Chromium binary by a 15%.
Reverting https://chromium-review.googlesource.com/1044220,
https://chromium-review.googlesource.com/1059408 and
fixes later bitrot.
Change-Id: Ic46c2832dbfacaeffa6a00a12a8a144cf0adf7f0
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui')
| -rw-r--r-- | chromium/chrome/browser/ui/BUILD.gn | 12 | ||||
| -rw-r--r-- | chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/chromium/chrome/browser/ui/BUILD.gn b/chromium/chrome/browser/ui/BUILD.gn index 5fe4e7e4722..83b55f3be57 100644 --- a/chromium/chrome/browser/ui/BUILD.gn +++ b/chromium/chrome/browser/ui/BUILD.gn @@ -20,6 +20,7 @@ import("//components/offline_pages/buildflags/features.gni") import("//components/signin/features.gni") import("//device/vr/buildflags/buildflags.gni") import("//extensions/buildflags/buildflags.gni") +import("//media/media_options.gni") import("//ppapi/buildflags/buildflags.gni") import("//printing/buildflags/buildflags.gni") import("//rlz/buildflags/buildflags.gni") @@ -242,8 +243,6 @@ static_library("ui") { "webui/media/media_engagement_ui.h", "webui/media/media_history_ui.cc", "webui/media/media_history_ui.h", - "webui/media/webrtc_logs_ui.cc", - "webui/media/webrtc_logs_ui.h", "webui/memory_internals_ui.cc", "webui/memory_internals_ui.h", "webui/metrics_handler.cc", @@ -532,7 +531,6 @@ static_library("ui") { "//components/viz/host", "//components/web_cache/browser", "//components/web_resource", - "//components/webrtc_logging/browser", "//content/app/resources", "//content/browser/webrtc/resources", "//content/public/common", @@ -4470,6 +4468,14 @@ static_library("ui") { } } + if (enable_webrtc) { + sources += [ + "webui/media/webrtc_logs_ui.cc", + "webui/media/webrtc_logs_ui.h", + ] + deps += [ "//components/webrtc_logging/browser" ] + } + if (safe_browsing_mode == 1) { deps += [ "//chrome/browser/ui/webui/reset_password:mojo_bindings", diff --git a/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index c9abbd97037..022c7c0f553 100644 --- a/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -56,7 +56,6 @@ #include "chrome/browser/ui/webui/media/media_engagement_ui.h" #include "chrome/browser/ui/webui/media/media_feeds_ui.h" #include "chrome/browser/ui/webui/media/media_history_ui.h" -#include "chrome/browser/ui/webui/media/webrtc_logs_ui.h" #include "chrome/browser/ui/webui/memory_internals_ui.h" #include "chrome/browser/ui/webui/net_export_ui.h" #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" @@ -110,6 +109,10 @@ #include "chrome/browser/ui/webui/nacl_ui.h" #endif +#if BUILDFLAG(ENABLE_WEBRTC) +#include "chrome/browser/ui/webui/media/webrtc_logs_ui.h" +#endif + #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #endif @@ -857,8 +860,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, } #endif +#if BUILDFLAG(ENABLE_WEBRTC) if (url.host_piece() == chrome::kChromeUIWebRtcLogsHost) return &NewWebUI<WebRtcLogsUI>; +#endif #if !defined(OS_ANDROID) if (url.host_piece() == chrome::kChromeUIMediaRouterInternalsHost && media_router::MediaRouterEnabled(profile)) { |