summaryrefslogtreecommitdiff
path: root/chromium/sandbox/policy/sandbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/sandbox/policy/sandbox.cc')
-rw-r--r--chromium/sandbox/policy/sandbox.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/sandbox/policy/sandbox.cc b/chromium/sandbox/policy/sandbox.cc
index 95482e83b8b..4270dc744c0 100644
--- a/chromium/sandbox/policy/sandbox.cc
+++ b/chromium/sandbox/policy/sandbox.cc
@@ -71,7 +71,12 @@ bool Sandbox::Initialize(SandboxType sandbox_type,
// process because it will initialize the sandbox broker, which requires
// the process to swap its window station. During this time all the UI
// will be broken. This has to run before threads and windows are created.
+#ifdef TOOLKIT_QT
+ // Disable alternate window station due to QTBUG-83300
+ ResultCode result = policy->CreateAlternateDesktop(false);
+#else
ResultCode result = policy->CreateAlternateDesktop(true);
+#endif
CHECK(SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result);
}
return true;