Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue34558.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -307,38 +307,17 @@ private async Task<bool> TryInitializeWebView2(WebView2 webView)
var initializingArgs = new WebViewInitializationStartedEventArgs();
VirtualView?.WebViewInitializationStarted(initializingArgs);

// Only create a custom CoreWebView2Environment when the user has provided custom
// settings. Creating a separate environment with all-default settings conflicts with
// other WebView2 controls (e.g., regular WebView) in the same app that use the
// default environment, because WebView2 requires all controls sharing the same user
// data folder to use compatible environments. When no customizations are needed,
// use EnsureCoreWebView2Async() so this control joins the default shared environment.
bool hasCustomSettings =
initializingArgs.BrowserExecutableFolder != null ||
initializingArgs.UserDataFolder != null ||
initializingArgs.EnvironmentOptions != null ||
!string.IsNullOrEmpty(initializingArgs.ScriptLocale) ||
initializingArgs.IsInPrivateModeEnabled ||
!string.IsNullOrEmpty(initializingArgs.ProfileName);

if (hasCustomSettings)
{
var env = await CoreWebView2Environment.CreateWithOptionsAsync(
browserExecutableFolder: initializingArgs.BrowserExecutableFolder,
userDataFolder: initializingArgs.UserDataFolder,
options: initializingArgs.EnvironmentOptions);
var env = await CoreWebView2Environment.CreateWithOptionsAsync(
browserExecutableFolder: initializingArgs.BrowserExecutableFolder,
userDataFolder: initializingArgs.UserDataFolder,
options: initializingArgs.EnvironmentOptions);

var options = env.CreateCoreWebView2ControllerOptions();
options.ScriptLocale = initializingArgs.ScriptLocale;
options.IsInPrivateModeEnabled = initializingArgs.IsInPrivateModeEnabled;
options.ProfileName = initializingArgs.ProfileName;
var options = env.CreateCoreWebView2ControllerOptions();
options.ScriptLocale = initializingArgs.ScriptLocale;
options.IsInPrivateModeEnabled = initializingArgs.IsInPrivateModeEnabled;
options.ProfileName = initializingArgs.ProfileName;

await webView.EnsureCoreWebView2Async(env, options);
}
else
{
await webView.EnsureCoreWebView2Async();
}
await webView.EnsureCoreWebView2Async(env, options);

webView.CoreWebView2.Settings.AreDevToolsEnabled = Handler?.DeveloperTools.Enabled ?? false;
webView.CoreWebView2.Settings.IsWebMessageEnabled = true;
Expand Down
Loading