Skip to content

Commit 07dc196

Browse files
authored
feat: add support for Waterfox browser detection (#1146)
1 parent 76bec67 commit 07dc196

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

ui/flutter/lib/util/browser_extension_host/entry/browser_extension_host_native.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Future<bool> doCheckBrowserInstalled(Browser browser) async {
5151
return await _checkWindowsRegistry(r'SOFTWARE\Mozilla\Firefox') ||
5252
await _checkWindowsRegistry(
5353
r'SOFTWARE\WOW6432Node\Mozilla\Firefox') ||
54+
await _checkWindowsRegistry(r'SOFTWARE\BrowserWorks\Waterfox') ||
5455
await _checkWindowsExecutable(browser);
5556
}
5657
} else {
@@ -144,6 +145,10 @@ List<String> _getWindowsExecutablePaths(Browser browser) {
144145
path.join(programFiles, 'Mozilla Firefox', 'firefox.exe'),
145146
if (programFilesX86 != null)
146147
path.join(programFilesX86, 'Mozilla Firefox', 'firefox.exe'),
148+
if (programFiles != null)
149+
path.join(programFiles, 'Waterfox', 'waterfox.exe'),
150+
if (programFilesX86 != null)
151+
path.join(programFilesX86, 'Waterfox', 'waterfox.exe'),
147152
];
148153
}
149154
}
@@ -178,7 +183,10 @@ List<String> _getUnixExecutablePaths(Browser browser) {
178183
return [
179184
'/Applications/Firefox.app',
180185
'~/Applications/Firefox.app',
181-
'/Users/${Platform.environment['USER']}/Applications/Firefox.app'
186+
'/Users/${Platform.environment['USER']}/Applications/Firefox.app',
187+
'/Applications/Waterfox.app',
188+
'~/Applications/Waterfox.app',
189+
'/Users/${Platform.environment['USER']}/Applications/Waterfox.app'
182190
];
183191
}
184192
} else {
@@ -203,7 +211,11 @@ List<String> _getUnixExecutablePaths(Browser browser) {
203211
'/usr/bin/firefox',
204212
'/snap/bin/firefox',
205213
'/usr/lib/firefox/firefox',
206-
'/opt/firefox/firefox'
214+
'/opt/firefox/firefox',
215+
'/usr/bin/waterfox',
216+
'/snap/bin/waterfox',
217+
'/usr/lib/waterfox/waterfox',
218+
'/opt/waterfox/waterfox'
207219
];
208220
}
209221
}

0 commit comments

Comments
 (0)