diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index d3b1c5f85114..66b88e67a24f 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -322,8 +322,8 @@ bool Window::IsKiosk() { return window_->IsKiosk(); } -void Window::OpenDevTools(bool dock) { - window_->OpenDevTools(!dock); +void Window::OpenDevTools(bool can_dock) { + window_->OpenDevTools(can_dock); } void Window::CloseDevTools() { diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 1b2c43d701dd..fbbd57cc60e8 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -105,7 +105,7 @@ class Window : public mate::EventEmitter, void SetSkipTaskbar(bool skip); void SetKiosk(bool kiosk); bool IsKiosk(); - void OpenDevTools(bool dock); + void OpenDevTools(bool can_dock); void CloseDevTools(); bool IsDevToolsOpened(); void InspectElement(int x, int y); diff --git a/atom/browser/api/lib/browser-window.coffee b/atom/browser/api/lib/browser-window.coffee index 2892746e1e25..93e744233885 100644 --- a/atom/browser/api/lib/browser-window.coffee +++ b/atom/browser/api/lib/browser-window.coffee @@ -42,7 +42,7 @@ BrowserWindow::_init = -> BrowserWindow::openDevTools = (options={}) -> options.detach ?= false - @_openDevTools(options.detach) + @_openDevTools !options.detach # Force devToolsWebContents to be created. @devToolsWebContents = @getDevToolsWebContents() diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 9384ffb0696a..c6c228416498 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -284,9 +284,8 @@ bool NativeWindow::HasModalDialog() { return has_dialog_attached_; } -void NativeWindow::OpenDevTools(bool dock) { - if (!dock) - inspectable_web_contents()->SetCanDock(false); +void NativeWindow::OpenDevTools(bool can_dock) { + inspectable_web_contents()->SetCanDock(can_dock); inspectable_web_contents()->ShowDevTools(); } diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index f229bba78313..15109ea31712 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -146,7 +146,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate, const std::string& description) = 0; virtual bool IsClosed() const { return is_closed_; } - virtual void OpenDevTools(bool dock); + virtual void OpenDevTools(bool can_dock); virtual void CloseDevTools(); virtual bool IsDevToolsOpened(); virtual void InspectElement(int x, int y);