Skip to content

Commit 10c0c28

Browse files
authored
[java] Recognise chrome-headless-shell as Chrome browser (#13292)
1 parent dee5bc5 commit 10c0c28

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

java/src/org/openqa/selenium/remote/Browser.java

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,56 +23,47 @@
2323
/** Used to identify a browser based on its name. */
2424
public interface Browser {
2525

26-
Browser CHROME = () -> "chrome";
27-
Browser EDGE =
26+
Browser CHROME =
2827
new Browser() {
2928
@Override
3029
public String browserName() {
31-
return "MicrosoftEdge";
30+
return "chrome";
3231
}
3332

3433
@Override
3534
public boolean is(String browserName) {
36-
return browserName().equals(browserName) || "msedge".equals(browserName);
35+
return Browser.super.is(browserName) || "chrome-headless-shell".equals(browserName);
3736
}
3837
};
39-
Browser HTMLUNIT = () -> "htmlunit";
40-
Browser IE = () -> "internet explorer";
41-
Browser FIREFOX = () -> "firefox";
42-
Browser OPERA =
38+
Browser EDGE =
4339
new Browser() {
4440
@Override
4541
public String browserName() {
46-
return "opera";
42+
return "MicrosoftEdge";
4743
}
4844

4945
@Override
5046
public boolean is(String browserName) {
51-
return browserName().equals(browserName);
47+
return Browser.super.is(browserName) || "msedge".equals(browserName);
5248
}
5349
};
50+
Browser HTMLUNIT = () -> "htmlunit";
51+
Browser IE = () -> "internet explorer";
52+
Browser FIREFOX = () -> "firefox";
53+
Browser OPERA = () -> "opera";
5454
Browser SAFARI =
5555
new Browser() {
5656
@Override
5757
public String browserName() {
5858
return "safari";
5959
}
6060

61-
public boolean is(String browserName) {
62-
return browserName().equals(browserName) || "Safari".equals(browserName);
63-
}
64-
};
65-
Browser SAFARI_TECH_PREVIEW =
66-
new Browser() {
6761
@Override
68-
public String browserName() {
69-
return "Safari Technology Preview";
70-
}
71-
7262
public boolean is(String browserName) {
73-
return browserName().equals(browserName);
63+
return Browser.super.is(browserName) || "Safari".equals(browserName);
7464
}
7565
};
66+
Browser SAFARI_TECH_PREVIEW = () -> "Safari Technology Preview";
7667

7768
String browserName();
7869

0 commit comments

Comments
 (0)