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

Show devtools for guest page in undocked mode

Browse source
This commit is contained in:
Cheng Zhao 2014-11-03 21:48:25 +08:00
parent 1731d609b7
commit accd08a2bf
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View file

@ -12,7 +12,6 @@
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/value_converter.h"
#include "atom/browser/atom_javascript_dialog_manager.h" #include "atom/browser/atom_javascript_dialog_manager.h"
#include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
@ -372,10 +371,8 @@ void WebContents::ExecuteJavaScript(const base::string16& code) {
} }
void WebContents::OpenDevTools() { void WebContents::OpenDevTools() {
storage_->SetCanDock(false);
storage_->ShowDevTools(); storage_->ShowDevTools();
// Force the inspectable web contents to be undocked when it is opened.
storage_->GetView()->SetIsDocked(false);
} }
bool WebContents::SendIPCMessage(const base::string16& channel, bool WebContents::SendIPCMessage(const base::string16& channel,

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit b90f13be24a006c55b7e1c935be492101ac2736c Subproject commit 90d2649bdd02ac544c79dc24802f7914370e833a