fix: allow docking DevTools with WCO (#35763)

fix: allow for docking devtools with WCO Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · Sep 26, 2022 · b077402 · b077402
1 parent 7f89857
commit b077402
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -2428,14 +2428,6 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
       !owner_window()) {
     state = "detach";
   }
-  bool activate = true;
-  if (args && args->Length() == 1) {
-    gin_helper::Dictionary options;
-    if (args->GetNext(&options)) {
-      options.Get("mode", &state);
-      options.Get("activate", &activate);
-    }
-  }
 
 #if BUILDFLAG(IS_WIN)
   auto* win = static_cast<NativeWindowViews*>(owner_window());
@@ -2445,6 +2437,15 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
     state = "detach";
 #endif
 
+  bool activate = true;
+  if (args && args->Length() == 1) {
+    gin_helper::Dictionary options;
+    if (args->GetNext(&options)) {
+      options.Get("mode", &state);
+      options.Get("activate", &activate);
+    }
+  }
+
   DCHECK(inspectable_web_contents_);
   inspectable_web_contents_->SetDockState(state);
   inspectable_web_contents_->ShowDevTools(activate);