summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/vr
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/vr
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/vr')
-rw-r--r--chromium/chrome/browser/vr/BUILD.gn14
-rw-r--r--chromium/chrome/browser/vr/testapp/BUILD.gn1
2 files changed, 2 insertions, 13 deletions
diff --git a/chromium/chrome/browser/vr/BUILD.gn b/chromium/chrome/browser/vr/BUILD.gn
index 21a50e49892..fa8a8089747 100644
--- a/chromium/chrome/browser/vr/BUILD.gn
+++ b/chromium/chrome/browser/vr/BUILD.gn
@@ -235,8 +235,6 @@ component("vr_common") {
"browser_renderer.cc",
"browser_renderer.h",
"browser_renderer_browser_interface.h",
- "consent/xr_session_request_consent_manager.cc",
- "consent/xr_session_request_consent_manager.h",
"frame_type.h",
"gesture_detector.cc",
"gesture_detector.h",
@@ -322,7 +320,6 @@ component("vr_common") {
# vr_ui must not depend on vr_common.
component("vr_base") {
sources = [
- "assets_component_update_status.h",
"assets_load_status.h",
"assets_loader.cc",
"assets_loader.h",
@@ -339,11 +336,6 @@ component("vr_base") {
"keyboard_delegate.h",
"keyboard_ui_interface.h",
"macros.h",
- "metrics/consent_flow_metrics_helper.cc",
- "metrics/consent_flow_metrics_helper.h",
- "metrics/metrics_helper.cc",
- "metrics/metrics_helper.h",
- "mode.h",
"model/assets.cc",
"model/assets.h",
"model/camera_model.h",
@@ -649,12 +641,8 @@ if (!is_android) {
# Infrastructure
sources = [
- "test/fake_xr_session_request_consent_manager.cc",
- "test/fake_xr_session_request_consent_manager.h",
"test/mock_xr_device_hook_base.cc",
"test/mock_xr_device_hook_base.h",
- "test/mock_xr_session_request_consent_manager.cc",
- "test/mock_xr_session_request_consent_manager.h",
"test/multi_class_browser_test.h",
]
@@ -683,12 +671,12 @@ if (!is_android) {
# Tests.
sources += [
- "webxr_vr_consent_dialog_browser_test.cc",
"webxr_vr_frame_loop_browser_test.cc",
"webxr_vr_frame_pose_browser_test.cc",
"webxr_vr_indicators_browser_test.cc",
"webxr_vr_input_browser_test.cc",
"webxr_vr_isolated_device_service_test.cc",
+ "webxr_vr_permission_browser_test.cc",
"webxr_vr_permission_request_browser_test.cc",
"webxr_vr_pixel_browser_test.cc",
"webxr_vr_tab_browser_test.cc",
diff --git a/chromium/chrome/browser/vr/testapp/BUILD.gn b/chromium/chrome/browser/vr/testapp/BUILD.gn
index 9034b01477d..dff7765200a 100644
--- a/chromium/chrome/browser/vr/testapp/BUILD.gn
+++ b/chromium/chrome/browser/vr/testapp/BUILD.gn
@@ -32,6 +32,7 @@ executable("vr_testapp") {
"//components/security_state/core",
"//components/tracing:startup_tracing",
"//components/vector_icons:vector_icons",
+ "//ui/base/cursor:cursor_base",
"//ui/display/types",
"//ui/events",
"//ui/events:dom_keycode_converter",