| Index: chrome/browser/resources/vr_shell/vr_shell_ui.js
|
| diff --git a/chrome/browser/resources/vr_shell/vr_shell_ui.js b/chrome/browser/resources/vr_shell/vr_shell_ui.js
|
| index 098f5b8ee9a117abfd6173c18376b876cfbaa731..20fd985641b27c0569947dd960a0971b82f87913 100644
|
| --- a/chrome/browser/resources/vr_shell/vr_shell_ui.js
|
| +++ b/chrome/browser/resources/vr_shell/vr_shell_ui.js
|
| @@ -101,14 +101,14 @@ var vrShellUi = (function() {
|
| if (this.menuMode == enabled)
|
| return;
|
| this.menuMode = enabled;
|
| - this.updateState()
|
| + this.updateState();
|
| }
|
|
|
| setFullscreen(enabled) {
|
| if (this.fullscreen == enabled)
|
| return;
|
| this.fullscreen = enabled;
|
| - this.updateState()
|
| + this.updateState();
|
| }
|
|
|
| updateState() {
|
| @@ -1038,8 +1038,10 @@ var vrShellUi = (function() {
|
| let fullscreen = this.fullscreen;
|
|
|
| api.doAction(api.Action.SET_CONTENT_PAUSED, {'paused': menuMode});
|
| + ui.setCursorEnabled(mode == api.Mode.STANDARD || menuMode);
|
| + ui.setWebVrRenderingEnabled(mode == api.Mode.WEB_VR && !menuMode);
|
|
|
| - this.contentQuad.setEnabled(mode == api.Mode.STANDARD);
|
| + this.contentQuad.setEnabled(mode == api.Mode.STANDARD || menuMode);
|
| this.contentQuad.setFullscreen(fullscreen);
|
| this.contentQuad.setMenuMode(menuMode);
|
| // TODO(crbug/643815): Set aspect ratio on content quad when available.
|
| @@ -1053,11 +1055,12 @@ var vrShellUi = (function() {
|
| this.secureOriginWarnings.setEnabled(
|
| mode == api.Mode.WEB_VR && !menuMode);
|
| this.background.setState(mode, menuMode, fullscreen);
|
| - this.tabContainer.setEnabled(mode == api.Mode.STANDARD && menuMode);
|
| + this.tabContainer.setEnabled(menuMode);
|
|
|
| this.reloadUiButton.setEnabled(mode == api.Mode.STANDARD);
|
| this.keyboard.setEnabled(mode == api.Mode.STANDARD && menuMode);
|
|
|
| +
|
| api.setUiCssSize(
|
| uiRootElement.clientWidth, uiRootElement.clientHeight, UI_DPR);
|
| }
|
|
|