[MV3 Debug Extension] Remove isMV3Extension field from DevtoolsRequest (

#1963)
dart-lang · Feb 15, 2023 · 3ad544e · 3ad544e
1 parent c77043e
commit 3ad544e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 93 deletions.
diff --git a/dwds/debug_extension_mv3/web/debug_session.dart b/dwds/debug_extension_mv3/web/debug_session.dart
@@ -275,8 +275,7 @@ Future<bool> _connectToDwds({
     ..instanceId = debugInfo.appInstanceId
     ..contextId = dartAppContextId
     ..tabUrl = tabUrl
-    ..uriOnly = true
-    ..isMv3Extension = true));
+    ..uriOnly = true));
   return true;
 }
 

diff --git a/dwds/lib/data/devtools_request.dart b/dwds/lib/data/devtools_request.dart
@@ -46,12 +46,6 @@ abstract class DevToolsRequest
   /// Only available on requests coming from the Dart Debug Extension. Is `null`
   /// for local debug service.
   bool? get uriOnly;
-
-  /// Whether or not the MV3 Dart Debug Extension sent the request. Is `null`
-  /// for local debug service.
-  ///
-  /// Only available on requests coming from the Dart Debug Extension.
-  bool? get isMv3Extension;
 }
 
 /// A response to a [DevToolsRequest].

diff --git a/dwds/lib/data/devtools_request.g.dart b/dwds/lib/data/devtools_request.g.dart
diff --git a/dwds/lib/src/handlers/dev_handler.dart b/dwds/lib/src/handlers/dev_handler.dart
@@ -561,14 +561,10 @@ class DevHandler {
       // handle how to open it. Therefore return early before opening a new
       // tab or window:
       if (devToolsRequest.uriOnly ?? false) {
-        // The MV3 extension is responsible for adding the IDE query
-        // parameter to the DevTools URI.
-        final devToolsUri = (devToolsRequest.isMv3Extension ?? false)
-            ? _constructDevToolsUri(encodedUri)
-            : _constructDevToolsUri(
-                encodedUri,
-                ideQueryParam: 'ChromeDevTools',
-              );
+        final devToolsUri = _constructDevToolsUri(
+          encodedUri,
+          ideQueryParam: 'ChromeDevTools',
+        );
         return extensionDebugger.sendEvent('dwds.devtoolsUri', devToolsUri);
       }
 

diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js