diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/chrome/browser/android | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/browser/android')
| -rw-r--r-- | chromium/chrome/browser/android/vr/BUILD.gn (renamed from chromium/chrome/browser/android/vr_shell/BUILD.gn) | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/chrome/browser/android/vr_shell/BUILD.gn b/chromium/chrome/browser/android/vr/BUILD.gn index 0150f161693..9e8263952a3 100644 --- a/chromium/chrome/browser/android/vr_shell/BUILD.gn +++ b/chromium/chrome/browser/android/vr/BUILD.gn @@ -27,14 +27,16 @@ static_library("vr_android") { "gvr_util.h", "mailbox_to_surface_bridge.cc", "mailbox_to_surface_bridge.h", - "vr_compositor.cc", - "vr_compositor.h", "vr_controller.cc", "vr_controller.h", "vr_core_info.cc", "vr_core_info.h", + "vr_dialog.cc", + "vr_dialog.h", "vr_gl_thread.cc", "vr_gl_thread.h", + "vr_input_connection.cc", + "vr_input_connection.h", "vr_metrics_util.cc", "vr_metrics_util.h", "vr_shell.cc", @@ -60,7 +62,7 @@ static_library("vr_android") { "//content/public/common", "//device/gamepad", "//device/vr", - "//services/device/public/interfaces", + "//services/device/public/mojom", "//services/metrics/public/cpp:ukm_builders", "//services/ui/public/cpp/gpu", "//ui/android", @@ -71,7 +73,7 @@ static_library("vr_android") { ] public_deps = [ - "//device/vr:mojo_bindings", + "//device/vr/public/mojom", ] libs = [ @@ -90,9 +92,11 @@ generate_jni("vr_shell_jni_headers") { "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/AndroidUiGestureTarget.java", "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/AndroidVSyncHelper.java", "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrCoreInfo.java", + "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrInputConnection.java", "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java", "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java", "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/keyboard/GvrKeyboardLoaderClient.java", + "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/keyboard/TextEditAction.java", ] jni_package = "vr_shell" } |