Skip to content

Commit 19d7925

Browse files
set web device name to Chrome (flutter#34856)
1 parent 3630525 commit 19d7925

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

packages/flutter_tools/lib/src/web/web_device.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class WebApplicationPackage extends ApplicationPackage {
2727
Directory get webSourcePath => flutterProject.directory.childDirectory('web');
2828
}
2929

30-
class WebDevice extends Device {
31-
WebDevice() : super(
32-
'web',
30+
class ChromeDevice extends Device {
31+
ChromeDevice() : super(
32+
'chrome',
3333
category: Category.web,
3434
platformType: PlatformType.web,
3535
ephemeral: false,
@@ -74,7 +74,7 @@ class WebDevice extends Device {
7474
bool isSupported() => flutterWebEnabled && canFindChrome();
7575

7676
@override
77-
String get name => 'web';
77+
String get name => 'Chrome';
7878

7979
@override
8080
DevicePortForwarder get portForwarder => const NoOpDevicePortForwarder();
@@ -143,9 +143,9 @@ class WebDevice extends Device {
143143
}
144144

145145
class WebDevices extends PollingDeviceDiscovery {
146-
WebDevices() : super('web');
146+
WebDevices() : super('chrome');
147147

148-
final WebDevice _webDevice = WebDevice();
148+
final ChromeDevice _webDevice = ChromeDevice();
149149

150150
@override
151151
bool get canListAnything => flutterWebEnabled;

packages/flutter_tools/test/web/devices_test.dart

+17-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import '../src/common.dart';
1313
import '../src/context.dart';
1414

1515
void main() {
16-
group(WebDevice, () {
16+
group(ChromeDevice, () {
1717
MockChromeLauncher mockChromeLauncher;
1818
MockPlatform mockPlatform;
1919
MockProcessManager mockProcessManager;
@@ -26,13 +26,27 @@ void main() {
2626
return null;
2727
});
2828
});
29+
30+
test('Defaults', () async {
31+
final ChromeDevice device = ChromeDevice();
32+
33+
expect(device.name, 'Chrome');
34+
expect(device.id, 'chrome');
35+
expect(device.supportsHotReload, true);
36+
expect(device.supportsHotRestart, true);
37+
expect(device.supportsStartPaused, true);
38+
expect(device.supportsFlutterExit, true);
39+
expect(device.supportsScreenshot, false);
40+
expect(await device.isLocalEmulator, false);
41+
});
42+
2943
testUsingContext('Invokes version command on non-Windows platforms', () async{
3044
when(mockPlatform.isWindows).thenReturn(false);
3145
when(mockProcessManager.canRun('chrome.foo')).thenReturn(true);
3246
when(mockProcessManager.run(<String>['chrome.foo', '--version'])).thenAnswer((Invocation invocation) async {
3347
return MockProcessResult(0, 'ABC');
3448
});
35-
final WebDevice webDevice = WebDevice();
49+
final ChromeDevice webDevice = ChromeDevice();
3650

3751
expect(webDevice.isSupported(), true);
3852
expect(await webDevice.sdkNameAndVersion, 'ABC');
@@ -53,7 +67,7 @@ void main() {
5367
])).thenAnswer((Invocation invocation) async {
5468
return MockProcessResult(0, r'HKEY_CURRENT_USER\Software\Google\Chrome\BLBeacon\ version REG_SZ 74.0.0 A');
5569
});
56-
final WebDevice webDevice = WebDevice();
70+
final ChromeDevice webDevice = ChromeDevice();
5771

5872
expect(webDevice.isSupported(), true);
5973
expect(await webDevice.sdkNameAndVersion, 'Google Chrome 74.0.0');

0 commit comments

Comments
 (0)