Add --disable-features=RendererAppContainer WebView2Environment option (

#30412)
microsoft · Dec 13, 2023 · 5d740e7 · 5d740e7
1 parent d61aa3a
commit 5d740e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs b/src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs
@@ -130,7 +130,7 @@ public override void DoPreview<T>(T dataSource)
                     DefaultBackgroundColor = Color.Transparent,
                 };
 
-                var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
+                var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
                 ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                         webView2EnvironmentAwaiter = CoreWebView2Environment
                             .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)

diff --git a/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs b/src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandlerControl.cs
@@ -125,10 +125,13 @@ public override void DoPreview<T>(T dataSource)
                     InitializeIndexFileAndSelectedFile(filePath);
 
                     Logger.LogInfo("Create WebView2 environment");
+                    var webView2Options = new CoreWebView2EnvironmentOptions("--disable-features=RendererAppContainer");
                     ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                         webView2EnvironmentAwaiter = CoreWebView2Environment
-                            .CreateAsync(userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
-                                                            "\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp")
+                            .CreateAsync(
+                            userDataFolder: System.Environment.GetEnvironmentVariable("USERPROFILE") +
+                                                "\\AppData\\LocalLow\\Microsoft\\PowerToys\\MonacoPreview-Temp",
+                            options: webView2Options)
                             .ConfigureAwait(true).GetAwaiter();
                     webView2EnvironmentAwaiter.OnCompleted(async () =>
                     {

diff --git a/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs b/src/modules/previewpane/SvgPreviewHandler/SvgPreviewControl.cs
@@ -225,7 +225,7 @@ private void AddWebViewControl(string svgData)
             _browser.Dock = DockStyle.Fill;
 
             // Prevent new windows from being opened.
-            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
+            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
             ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                webView2EnvironmentAwaiter = CoreWebView2Environment
                    .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)

diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs
@@ -142,7 +142,7 @@ public Bitmap GetThumbnailImpl(uint cx)
                 thumbnailDone.Set();
             };
 
-            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents");
+            var webView2Options = new CoreWebView2EnvironmentOptions("--block-new-web-contents --disable-features=RendererAppContainer");
             ConfiguredTaskAwaitable<CoreWebView2Environment>.ConfiguredTaskAwaiter
                webView2EnvironmentAwaiter = CoreWebView2Environment
                    .CreateAsync(userDataFolder: _webView2UserDataFolder, options: webView2Options)