Pull in vr_shell code for webvr

chrome/browser/browser_resources.grd

Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 3e1bb213b022dea68074edf1e62c21a1e8d5b842..7b4ec625eaa8c46e08bbc20ade5c905953d1b681 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -198,8 +198,7 @@
         <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_internals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
         <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_internals.css" compress="gzip" type="BINDATA" />
         <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_internals.js" compress="gzip" type="BINDATA" />
-        <!-- TODO: Enable only for VrShell, independent of Android. -->
-        <if expr="enable_vr_shell">
+        <if expr="enable_vr_shell or enable_webvr">
           <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell_ui.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />

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

same here. vr_common.html?

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

The reason I need to set enable webvr here is that webvr needs vr_shell's ui
system to draw
a shell ui on top of insecure content. So vr_shell.html probably makes more
senses since we
are still drawing shell ui in webvr?

           <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ui.css" type="BINDATA" />
           <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_ui.js" type="BINDATA" />