Pull in vr_shell code for webvr

chrome/browser/ui/BUILD.gn

Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 849499a5344ce432138edd81ad1af1e553172722..c1bf16fdf299628aef8403313e62430a250f5387 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2203,8 +2203,10 @@ split_static_library("ui") {
         "webui/snippets_internals_ui.cc",
         "webui/snippets_internals_ui.h",
       ]
-      if (enable_vr_shell) {
-        defines += [ "ENABLE_VR_SHELL" ]
+      if (enable_vr_shell || enable_webvr) {
+        if (enable_vr_shell) {
+          defines += [ "ENABLE_VR_SHELL" ]
+        }
         sources += [
           "webui/vr_shell/vr_shell_ui_message_handler.cc",

[agrieve, 2016/10/07 17:36:43]

and here

[bshe, 2016/10/07 20:36:22]

ditto

           "webui/vr_shell/vr_shell_ui_message_handler.h",
@@ -2212,7 +2214,7 @@ split_static_library("ui") {
           "webui/vr_shell/vr_shell_ui_ui.h",
         ]
         configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
-        deps += [ "//chrome/browser/android/vr_shell:vr_shell" ]
+        deps += [ "//chrome/browser/android/vr_shell:vr_common" ]
       }
       if (enable_vr_shell_ui_dev) {
         assert(enable_vr_shell)