diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/android/features/vr | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-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/android/features/vr')
| -rw-r--r-- | chromium/chrome/android/features/vr/BUILD.gn | 8 | ||||
| -rw-r--r-- | chromium/chrome/android/features/vr/public_vr_java_sources.gni | 12 |
2 files changed, 1 insertions, 19 deletions
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn index 7bd362cbbbf..d22b6f77061 100644 --- a/chromium/chrome/android/features/vr/BUILD.gn +++ b/chromium/chrome/android/features/vr/BUILD.gn @@ -77,6 +77,7 @@ android_library("java") { "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", "//components/browser_ui/modaldialog/android:java", @@ -106,8 +107,6 @@ generate_jni("jni_headers") { sources = [ "java/src/org/chromium/chrome/browser/vr/AndroidUiGestureTarget.java", "java/src/org/chromium/chrome/browser/vr/AndroidVSyncHelper.java", - "java/src/org/chromium/chrome/browser/vr/ConsentFlowMetrics.java", - "java/src/org/chromium/chrome/browser/vr/VrConsentDialog.java", "java/src/org/chromium/chrome/browser/vr/VrCoreInfo.java", "java/src/org/chromium/chrome/browser/vr/VrInputConnection.java", "java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java", @@ -116,9 +115,4 @@ generate_jni("jni_headers") { "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java", "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java", ] - - if (enable_arcore) { - sources += - [ "java/src/org/chromium/chrome/browser/vr/ArConsentDialog.java" ] - } } diff --git a/chromium/chrome/android/features/vr/public_vr_java_sources.gni b/chromium/chrome/android/features/vr/public_vr_java_sources.gni index 219a498aa53..a74e6c266ba 100644 --- a/chromium/chrome/android/features/vr/public_vr_java_sources.gni +++ b/chromium/chrome/android/features/vr/public_vr_java_sources.gni @@ -16,15 +16,3 @@ public_vr_java_sources = [ "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModeProviderImpl.java", "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java", ] - -if (enable_vr) { - public_vr_java_sources += [ - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/ConsentFlowMetrics.java", - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrConsentDialog.java", - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrConsentListener.java", - ] -} - -if (enable_arcore) { - public_vr_java_sources += [ "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/ArConsentDialog.java" ] -} |