From accd08a2bf449cafdb29e5b4b3da97641f148704 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 3 Nov 2014 21:48:25 +0800 Subject: [PATCH] Show devtools for guest page in undocked mode --- atom/browser/api/atom_api_web_contents.cc | 5 +---- vendor/brightray | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index e47eccad1aad..6feb0fb1368d 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -12,7 +12,6 @@ #include "atom/common/native_mate_converters/value_converter.h" #include "atom/browser/atom_javascript_dialog_manager.h" #include "brightray/browser/inspectable_web_contents.h" -#include "brightray/browser/inspectable_web_contents_view.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" @@ -372,10 +371,8 @@ void WebContents::ExecuteJavaScript(const base::string16& code) { } void WebContents::OpenDevTools() { + storage_->SetCanDock(false); 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, diff --git a/vendor/brightray b/vendor/brightray index b90f13be24a0..90d2649bdd02 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit b90f13be24a006c55b7e1c935be492101ac2736c +Subproject commit 90d2649bdd02ac544c79dc24802f7914370e833a