diff --git a/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart b/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart index 40b40f56767..6bef59f0d58 100644 --- a/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart +++ b/packages/devtools_app/lib/src/framework/scaffold/settings_dialog.dart @@ -11,7 +11,6 @@ import 'package:provider/provider.dart'; import '../../shared/analytics/analytics_controller.dart'; import '../../shared/analytics/constants.dart' as gac; import '../../shared/config_specific/copy_to_clipboard/copy_to_clipboard.dart'; -import '../../shared/feature_flags.dart'; import '../../shared/globals.dart'; import '../../shared/log_storage.dart'; import '../../shared/server/server.dart'; @@ -77,23 +76,21 @@ class SettingsDialog extends StatelessWidget { gaItem: gac.vmDeveloperMode, ), ), - if (FeatureFlags.wasmOptInSetting.isEnabled) ...[ - const SizedBox(height: largeSpacing), - ...dialogSubHeader(theme, 'Experimental features'), - Flexible( - child: CheckboxSetting( - title: '[Recommended] Enable WebAssembly', - description: - 'This will trigger a reload of the page to load DevTools ' - 'compiled with WebAssembly. This may yield better ' - 'performance.', - notifier: preferences.wasmEnabled, - onChanged: preferences.toggleWasmEnabled, - gaScreen: gac.settingsDialog, - gaItem: gac.wasm, - ), + const SizedBox(height: largeSpacing), + ...dialogSubHeader(theme, 'Experimental features'), + Flexible( + child: CheckboxSetting( + title: '[Recommended] Enable WebAssembly', + description: + 'This will trigger a reload of the page to load DevTools ' + 'compiled with WebAssembly. This may yield better ' + 'performance.', + notifier: preferences.wasmEnabled, + onChanged: preferences.toggleWasmEnabled, + gaScreen: gac.settingsDialog, + gaItem: gac.wasm, ), - ], + ), const SizedBox(height: largeSpacing), ...dialogSubHeader(theme, 'Troubleshooting'), const _VerboseLoggingSetting(), diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart index cdd187acf6d..4a4daefcc88 100644 --- a/packages/devtools_app/lib/src/shared/feature_flags.dart +++ b/packages/devtools_app/lib/src/shared/feature_flags.dart @@ -85,14 +85,6 @@ extension FeatureFlags on Never { enabled: true, ); - /// Flag to enable the DevTools setting to opt-in to WASM. - /// - /// https://github.com/flutter/devtools/issues/7856 - static final wasmOptInSetting = BooleanFeatureFlag( - name: 'wasmOptInSetting', - enabled: true, - ); - /// Flag to enable refactors in the Flutter Property Editor sidebar. /// /// https://github.com/flutter/devtools/issues/9214 @@ -121,7 +113,6 @@ extension FeatureFlags on Never { devToolsExtensions, dapDebugging, inspectorV2, - wasmOptInSetting, propertyEditorRefactors, }; diff --git a/packages/devtools_app/lib/src/shared/preferences/preferences.dart b/packages/devtools_app/lib/src/shared/preferences/preferences.dart index eb9730a227f..d1ae1de01de 100644 --- a/packages/devtools_app/lib/src/shared/preferences/preferences.dart +++ b/packages/devtools_app/lib/src/shared/preferences/preferences.dart @@ -17,7 +17,6 @@ import '../analytics/constants.dart' as gac; import '../config_specific/logger/logger_helpers.dart'; import '../constants.dart'; import '../diagnostics/inspector_service.dart'; -import '../feature_flags.dart'; import '../globals.dart'; import '../primitives/query_parameters.dart'; import '../server/server.dart'; @@ -122,9 +121,7 @@ class PreferencesController extends DisposableController // Get the current values and listen for and write back changes. await _initDarkMode(); await _initAdvancedDeveloperMode(); - if (FeatureFlags.wasmOptInSetting.isEnabled) { - await _initWasmEnabled(); - } + await _initWasmEnabled(); await _initVerboseLogging(); await cpuProfiler.init(); diff --git a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart index 3939d5561c1..6e79255e461 100644 --- a/packages/devtools_app/test/shared/primitives/feature_flags_test.dart +++ b/packages/devtools_app/test/shared/primitives/feature_flags_test.dart @@ -21,7 +21,6 @@ void main() { expect(FeatureFlags.devToolsExtensions.isEnabled, isExternalBuild); expect(FeatureFlags.dapDebugging.isEnabled, false); expect(FeatureFlags.inspectorV2.isEnabled, true); - expect(FeatureFlags.wasmOptInSetting.isEnabled, true); expect(FeatureFlags.propertyEditorRefactors.isEnabled, true); });