Skip to content

Commit 3e0333d

Browse files
WebView2GithubBotWebView2GithubBot
committed
Updates for Win32, WPF, WinForms, UWP and WinUI3 sample apps from 145.0.3796.0
1 parent beef1ea commit 3e0333d

File tree

9 files changed

+80
-44
lines changed

9 files changed

+80
-44
lines changed

‎SampleApps/WebView2APISample/AppWindow.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ class AppWindow
242242
bool SuppressDefaultFindDialog();
243243
bool IsCaseSensitive();
244244
wil::com_ptr<ICoreWebView2FindOptions> SetDefaultFindOptions();
245+
245246
void SetupFindEventHandlers(wil::com_ptr<ICoreWebView2Find> webView2find);
246247
// Find on Page member
247248
std::wstring m_findOnPageLastSearchTerm;

‎SampleApps/WebView2APISample/ScriptComponent.cpp‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -649,33 +649,6 @@ void ScriptComponent::HandleCDPTargets()
649649
.Get(),
650650
&m_targetDetachedToken));
651651
receiver.reset();
652-
CHECK_FAILURE(
653-
m_webView->GetDevToolsProtocolEventReceiver(L"Target.targetCreated", &receiver));
654-
CHECK_FAILURE(receiver->add_DevToolsProtocolEventReceived(
655-
Callback<ICoreWebView2DevToolsProtocolEventReceivedEventHandler>(
656-
[this](
657-
ICoreWebView2* sender,
658-
ICoreWebView2DevToolsProtocolEventReceivedEventArgs* args) -> HRESULT
659-
{
660-
// Shared worker targets are not auto attached. Have to attach it explicitly.
661-
wil::unique_cotaskmem_string jsonMessage;
662-
CHECK_FAILURE(args->get_ParameterObjectAsJson(&jsonMessage));
663-
std::wstring type = GetJSONStringField(jsonMessage.get(), L"type");
664-
if (type == L"shared_worker")
665-
{
666-
std::wstring targetId = GetJSONStringField(jsonMessage.get(), L"targetId");
667-
std::wstring parameters =
668-
L"{\"targetId\":\"" + targetId + L"\",\"flatten\": true}";
669-
// Call Target.attachToTarget and ignore returned value, let
670-
// Target.attachedToTarget to handle the result.
671-
m_webView->CallDevToolsProtocolMethod(
672-
L"Target.attachToTarget", parameters.c_str(), nullptr);
673-
}
674-
return S_OK;
675-
})
676-
.Get(),
677-
&m_targetCreatedToken));
678-
receiver.reset();
679652
CHECK_FAILURE(
680653
m_webView->GetDevToolsProtocolEventReceiver(L"Target.targetInfoChanged", &receiver));
681654
CHECK_FAILURE(receiver->add_DevToolsProtocolEventReceived(

‎SampleApps/WebView2APISample/SettingsComponent.cpp‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,13 +1291,20 @@ bool SettingsComponent::HandleWindowMessage(
12911291
case IDM_TRACKING_PREVENTION_LEVEL_STRICT:
12921292
SetTrackingPreventionLevel(COREWEBVIEW2_TRACKING_PREVENTION_LEVEL_STRICT);
12931293
return true;
1294+
case IDM_ENHANCED_SECURITY_MODE_LEVEL_OFF:
1295+
SetEnhancedSecurityModeLevel(COREWEBVIEW2_ENHANCED_SECURITY_MODE_LEVEL_OFF);
1296+
return true;
1297+
case IDM_ENHANCED_SECURITY_MODE_LEVEL_STRICT:
1298+
SetEnhancedSecurityModeLevel(COREWEBVIEW2_ENHANCED_SECURITY_MODE_LEVEL_STRICT);
1299+
return true;
12941300
case ID_SETTINGS_NON_CLIENT_REGION_SUPPORT_ENABLED:
12951301
{
12961302
//![ToggleNonClientRegionSupportEnabled]
12971303
BOOL nonClientRegionSupportEnabled;
12981304
wil::com_ptr<ICoreWebView2Settings9> settings;
12991305
settings = m_settings.try_query<ICoreWebView2Settings9>();
13001306
CHECK_FEATURE_RETURN(settings);
1307+
13011308
CHECK_FAILURE(
13021309
settings->get_IsNonClientRegionSupportEnabled(&nonClientRegionSupportEnabled));
13031310
if (nonClientRegionSupportEnabled)
@@ -1807,6 +1814,38 @@ void SettingsComponent::SetTrackingPreventionLevel(COREWEBVIEW2_TRACKING_PREVENT
18071814
}
18081815
//! [SetTrackingPreventionLevel]
18091816

1817+
//! [SetEnhancedSecurityModeLevel]
1818+
void SettingsComponent::SetEnhancedSecurityModeLevel(
1819+
COREWEBVIEW2_ENHANCED_SECURITY_MODE_LEVEL value)
1820+
{
1821+
wil::com_ptr<ICoreWebView2_13> webView2_13;
1822+
webView2_13 = m_webView.try_query<ICoreWebView2_13>();
1823+
1824+
if (webView2_13)
1825+
{
1826+
wil::com_ptr<ICoreWebView2Profile> profile;
1827+
CHECK_FAILURE(webView2_13->get_Profile(&profile));
1828+
1829+
auto experimentalProfile9 = profile.try_query<ICoreWebView2ExperimentalProfile9>();
1830+
if (experimentalProfile9)
1831+
{
1832+
CHECK_FAILURE(experimentalProfile9->put_EnhancedSecurityModeLevel(value));
1833+
1834+
const wchar_t* levelText = L"Off";
1835+
if (value == COREWEBVIEW2_ENHANCED_SECURITY_MODE_LEVEL_STRICT)
1836+
{
1837+
levelText = L"Strict";
1838+
}
1839+
1840+
MessageBox(
1841+
nullptr,
1842+
(std::wstring(L"Enhanced Security Mode level is set to ") + levelText).c_str(),
1843+
L"Enhanced Security Mode Level", MB_OK);
1844+
}
1845+
}
1846+
}
1847+
//! [SetEnhancedSecurityModeLevel]
1848+
18101849
SettingsComponent::~SettingsComponent()
18111850
{
18121851
m_webView->remove_NavigationStarting(m_navigationStartingToken);

‎SampleApps/WebView2APISample/SettingsComponent.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class SettingsComponent : public ComponentBase
4646

4747
void SetTrackingPreventionLevel(COREWEBVIEW2_TRACKING_PREVENTION_LEVEL value);
4848

49+
void SetEnhancedSecurityModeLevel(COREWEBVIEW2_ENHANCED_SECURITY_MODE_LEVEL value);
50+
4951
~SettingsComponent() override;
5052

5153
private:

‎SampleApps/WebView2APISample/WebView2APISample.rc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ BEGIN
165165
MENUITEM "Balanced", IDM_TRACKING_PREVENTION_LEVEL_BALANCED
166166
MENUITEM "Strict", IDM_TRACKING_PREVENTION_LEVEL_STRICT
167167
END
168+
POPUP "Enhanced Security Mode Level"
169+
BEGIN
170+
MENUITEM "Off", IDM_ENHANCED_SECURITY_MODE_LEVEL_OFF
171+
MENUITEM "Strict", IDM_ENHANCED_SECURITY_MODE_LEVEL_STRICT
172+
END
168173
MENUITEM "Toggle Non-Client Region Support", ID_SETTINGS_NON_CLIENT_REGION_SUPPORT_ENABLED
169174
END
170175
POPUP "&View"

‎SampleApps/WebView2APISample/WebView2APISample.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -541,4 +541,4 @@
541541
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
542542
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.3712-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.3712-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
543543
</Target>
544-
</Project>
544+
</Project>

‎SampleApps/WebView2APISample/resource.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@
126126
#define IDC_EDIT_SAVE_AS_FILENAME 262
127127
#define IDC_CHECK_SAVE_AS_ALLOW_REPLACE 263
128128
#define IDC_SAVE_AS_KIND 264
129+
#define IDM_ENHANCED_SECURITY_MODE_LEVEL_OFF 265
130+
#define IDM_ENHANCED_SECURITY_MODE_LEVEL_STRICT 266
129131
#define IDM_TOGGLE_TOPMOST_WINDOW 300
130132
#define IDM_PROCESS_EXTENDED_INFO 301
131133
#define IDE_ADDRESSBAR 1000

‎SampleApps/WebView2WpfBrowser/MainWindow.xaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ found in the LICENSE file.
7878
<CommandBinding Command="{x:Static local:MainWindow.NewWindowWithOptionsCommand}" Executed="NewWindowWithOptionsCmdExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
7979
<CommandBinding Command="{x:Static local:MainWindow.CreateNewThreadCommand}" Executed="CreateNewThreadCmdExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
8080
<CommandBinding Command="{x:Static local:MainWindow.TrackingPreventionLevelCommand}" Executed="TrackingPreventionLevelCommandExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
81+
<!-- #if USE_WEBVIEW2_EXPERIMENTAL -->
82+
<CommandBinding Command="{x:Static local:MainWindow.EnhancedSecurityModeLevelCommand}" Executed="EnhancedSecurityModeLevelCommandExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
83+
<!-- #endif -->
8184
<CommandBinding Command="{x:Static local:MainWindow.PrintDialogCommand}" Executed="PrintDialogCmdExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
8285
<CommandBinding Command="{x:Static local:MainWindow.PrintToDefaultPrinterCommand}" Executed="PrintToDefaultPrinterCmdExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
8386
<CommandBinding Command="{x:Static local:MainWindow.PrintToPrinterCommand}" Executed="PrintToPrinterCmdExecuted" CanExecute="CoreWebView2RequiringCmdsCanExecute"/>
@@ -201,6 +204,12 @@ found in the LICENSE file.
201204
<MenuItem Header="_Balanced" Command="{x:Static local:MainWindow.TrackingPreventionLevelCommand}" CommandParameter="Balanced"/>
202205
<MenuItem Header="_Strict" Command="{x:Static local:MainWindow.TrackingPreventionLevelCommand}" CommandParameter="Strict"/>
203206
</MenuItem>
207+
<!-- #if USE_WEBVIEW2_EXPERIMENTAL -->
208+
<MenuItem Header="_Enhanced Security Mode Level">
209+
<MenuItem Header="_Off" Command="{x:Static local:MainWindow.EnhancedSecurityModeLevelCommand}" CommandParameter="Off"/>
210+
<MenuItem Header="_Strict" Command="{x:Static local:MainWindow.EnhancedSecurityModeLevelCommand}" CommandParameter="Strict"/>
211+
</MenuItem>
212+
<!-- #endif -->
204213
<MenuItem Header="Toggle Non-Client Region Support" Command="{x:Static local:MainWindow.NonClientRegionSupportCommand}"/>
205214
</MenuItem>
206215
<MenuItem Header="_View">

‎SampleApps/WebView2WpfBrowser/MainWindow.xaml.cs‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ public partial class MainWindow : Window
8383
public static RoutedCommand ExtensionsCommand = new RoutedCommand();
8484
public static RoutedCommand TrackingPreventionLevelCommand = new RoutedCommand();
8585
public static RoutedCommand EnhancedSecurityModeLevelCommand = new RoutedCommand();
86-
public static RoutedCommand EnhancedSecurityModeGetBypassListCommand = new RoutedCommand();
87-
public static RoutedCommand EnhancedSecurityModeSetBypassListCommand = new RoutedCommand();
88-
public static RoutedCommand EnhancedSecurityModeGetEnforceListCommand = new RoutedCommand();
89-
public static RoutedCommand EnhancedSecurityModeSetEnforceListCommand = new RoutedCommand();
9086
public static RoutedCommand WebRtcUdpPortConfigCommand = new RoutedCommand();
9187
public static RoutedCommand PrintDialogCommand = new RoutedCommand();
9288
public static RoutedCommand PrintToDefaultPrinterCommand = new RoutedCommand();
@@ -1022,22 +1018,31 @@ void SetTrackingPreventionLevel(CoreWebView2TrackingPreventionLevel value)
10221018
}
10231019
// <SetTrackingPreventionLevel>
10241020

1025-
10261021
void EnhancedSecurityModeLevelCommandExecuted(object target, ExecutedRoutedEventArgs e)
10271022
{
1023+
#if USE_WEBVIEW2_EXPERIMENTAL
1024+
string level = e.Parameter.ToString();
1025+
if (level == "Off")
1026+
{
1027+
SetEnhancedSecurityModeLevel(CoreWebView2EnhancedSecurityModeLevel.Off);
1028+
}
1029+
else
1030+
{
1031+
SetEnhancedSecurityModeLevel(CoreWebView2EnhancedSecurityModeLevel.Strict);
1032+
}
1033+
#endif
10281034
}
1029-
void EnhancedSecurityModeGetBypassListCommandExecuted(object target, ExecutedRoutedEventArgs e)
1030-
{
1031-
}
1032-
void EnhancedSecurityModeSetBypassListCommandExecuted(object target, ExecutedRoutedEventArgs e)
1033-
{
1034-
}
1035-
void EnhancedSecurityModeGetEnforceListCommandExecuted(object target, ExecutedRoutedEventArgs e)
1036-
{
1037-
}
1038-
void EnhancedSecurityModeSetEnforceListCommandExecuted(object target, ExecutedRoutedEventArgs e)
1035+
1036+
#if USE_WEBVIEW2_EXPERIMENTAL
1037+
// <SetEnhancedSecurityModeLevel>
1038+
void SetEnhancedSecurityModeLevel(CoreWebView2EnhancedSecurityModeLevel value)
10391039
{
1040+
WebViewProfile.EnhancedSecurityModeLevel = value;
1041+
MessageBox.Show(this, "Enhanced security mode level is set successfully", "Enhanced Security Mode Level");
10401042
}
1043+
// <SetEnhancedSecurityModeLevel>
1044+
#endif
1045+
10411046
void WebRtcUdpPortConfigCommandExecuted(object target, ExecutedRoutedEventArgs e)
10421047
{
10431048
#if USE_WEBVIEW2_EXPERIMENTAL

0 commit comments

Comments
 (0)