mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: allow docking DevTools with WCO (#35754)

Browse source 
fix: allow for docking devtools with WCO
This commit is contained in:
Shelley Vohr 2022-09-22 01:44:27 -07:00 committed by GitHub
parent 4ffdd284c3
commit eb3262cd87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shell/browser/api/electron_api_web_contents.cc
View file

@ -2424,14 +2424,6 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
!owner_window()) { !owner_window()) {
state = "detach"; 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) #if BUILDFLAG(IS_WIN)
auto* win = static_cast<NativeWindowViews*>(owner_window()); auto* win = static_cast<NativeWindowViews*>(owner_window());
@ -2441,6 +2433,15 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
state = "detach"; state = "detach";
#endif #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_); DCHECK(inspectable_web_contents_);
inspectable_web_contents_->SetDockState(state); inspectable_web_contents_->SetDockState(state);
inspectable_web_contents_->ShowDevTools(activate); inspectable_web_contents_->ShowDevTools(activate);