commit f4fa4460242c7a38d416fe7f83caa88c18f8ae03
author bshe <bshe@chromium.org> Wed Oct 12 00:41:55 2016
committer Commit bot <commit-bot@chromium.org> Wed Oct 12 00:44:46 2016
tree 91ce2320a725ca08d7ab57bad1349e3b4d47085f
parent a5b678c030986c136a5696b7287d399d85032dab

Pull in vr_shell code for webvr

BUG=389343

Review-Url: https://codereview.chromium.org/2399533002
Cr-Commit-Position: refs/heads/master@{#424616}

chrome/browser/BUILD.gn

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c6366d9b..11e171b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3355,9 +3355,12 @@
     }
   }
 
-  if (enable_vr_shell && android_java_ui) {
-    defines += [ "ENABLE_VR_SHELL" ]
-    deps += [ "android/vr_shell:vr_shell" ]
+  if (enable_vr_shell || enable_webvr) {
+    if (enable_vr_shell) {
+      defines += [ "ENABLE_VR_SHELL" ]
+    }
+
+    deps += [ "android/vr_shell:vr_common" ]
     configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
   }