Skip to content

Commit aca5bdc

Browse files
committed
Merge conflicts
1 parent 376b6e4 commit aca5bdc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
// </copyright>
1919

2020
using OpenQA.Selenium.BiDi.Communication;
21-
using System.Text.Json.Serialization;
2221

2322
namespace OpenQA.Selenium.BiDi.Browser;
2423

25-
public sealed record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
24+
public sealed record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y) : EmptyResult;
2625

2726
public enum ClientWindowState
2827
{

dotnet/src/webdriver/BiDi/Browser/SetClientWindowStateCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal class SetClientWindowStateCommand(SetClientWindowStateCommandParameters
2727

2828
[JsonDerivedType(typeof(SetClientWindowNamedStateCommandParameters))]
2929
[JsonDerivedType(typeof(SetClientWindowRectStateCommandParameters))]
30-
internal abstract record SetClientWindowStateCommandParameters(ClientWindow ClientWindow) : CommandParameters;
30+
internal abstract record SetClientWindowStateCommandParameters(ClientWindow ClientWindow) : Parameters;
3131

3232
internal record SetClientWindowNamedStateCommandParameters(ClientWindow ClientWindow, ClientWindowNamedState State) : SetClientWindowStateCommandParameters(ClientWindow);
3333

@@ -45,9 +45,9 @@ internal record SetClientWindowRectStateCommandParameters(ClientWindow ClientWin
4545
public int? Y { get; set; } = Options?.Y;
4646
}
4747

48-
public record SetClientWindowNamedStateOptions : CommandOptions;
48+
public sealed class SetClientWindowNamedStateOptions : CommandOptions;
4949

50-
public record SetClientWindowRectStateOptions : CommandOptions
50+
public sealed class SetClientWindowRectStateOptions : CommandOptions
5151
{
5252
public int? Width { get; set; }
5353

0 commit comments

Comments
 (0)