Commit 81319cfd authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Introduce build config for touchless media controls.

Bug: 942577
Change-Id: I61985da174bda2dd1dfa35b971b7738b7aaaeef6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1543452
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#645342}
parent 40a807f8
...@@ -31,6 +31,10 @@ config("modules_implementation") { ...@@ -31,6 +31,10 @@ config("modules_implementation") {
defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
} }
config("notouch_config") {
defines = [ "TOUCHLESS_MEDIA_CONTROLS" ]
}
make_names("module_names") { make_names("module_names") {
in_files = [ "indexeddb/indexed_db_names.json5" ] in_files = [ "indexeddb/indexed_db_names.json5" ]
output_dir = blink_modules_output_dir output_dir = blink_modules_output_dir
...@@ -181,6 +185,10 @@ target("jumbo_" + modules_target_type, "modules") { ...@@ -181,6 +185,10 @@ target("jumbo_" + modules_target_type, "modules") {
configs -= [ "//build/config/compiler:default_symbols" ] configs -= [ "//build/config/compiler:default_symbols" ]
configs += blink_symbols_config configs += blink_symbols_config
if (is_android && notouch_build) {
configs += [ ":notouch_config" ]
}
} }
jumbo_source_set("modules_testing") { jumbo_source_set("modules_testing") {
......
...@@ -94,6 +94,10 @@ ...@@ -94,6 +94,10 @@
#include "third_party/blink/renderer/platform/wtf/functional.h" #include "third_party/blink/renderer/platform/wtf/functional.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
#if defined(TOUCHLESS_MEDIA_CONTROLS)
#include "third_party/blink/renderer/modules/media_controls/touchless/media_controls_touchless_impl.h"
#endif
namespace blink { namespace blink {
void ModulesInitializer::Initialize() { void ModulesInitializer::Initialize() {
...@@ -203,7 +207,11 @@ void ModulesInitializer::ProvideIndexedDBClientToWorker( ...@@ -203,7 +207,11 @@ void ModulesInitializer::ProvideIndexedDBClientToWorker(
MediaControls* ModulesInitializer::CreateMediaControls( MediaControls* ModulesInitializer::CreateMediaControls(
HTMLMediaElement& media_element, HTMLMediaElement& media_element,
ShadowRoot& shadow_root) const { ShadowRoot& shadow_root) const {
#if defined(TOUCHLESS_MEDIA_CONTROLS)
return MediaControlsTouchlessImpl::Create(media_element, shadow_root);
#else
return MediaControlsImpl::Create(media_element, shadow_root); return MediaControlsImpl::Create(media_element, shadow_root);
#endif
} }
PictureInPictureController* PictureInPictureController*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment