Disable the detachment of devtools.

diff --git a/browser/devtools_delegate.cc b/browser/devtools_delegate.cc
index 37bba54bc1db3c309ad000470afd615db739a903..3886bfe22202b5a6f43e8ce991f54274425b126c 100644 (file)
--- a/browser/devtools_delegate.cc
+++ b/browser/devtools_delegate.cc
@@ -20,6 +20,7 @@ DevToolsDelegate::DevToolsDelegate(NativeWindow* window,
                                    content::WebContents* target_web_contents)
     : content::WebContentsObserver(window->GetWebContents()),
       owner_window_(window),
+      delegate_(NULL),
       embedder_message_dispatcher_(
           new DevToolsEmbedderMessageDispatcher(this)) {
   content::WebContents* web_contents = window->GetWebContents();
@@ -78,7 +79,11 @@ void DevToolsDelegate::MoveWindow(int x, int y) {
 }
 
 void DevToolsDelegate::SetDockSide(const std::string& dock_side) {
-  owner_window_->Close();
+  bool succeed = true;
+  if (delegate_ &&
+      delegate_->DevToolsSetDockSide("attach-back", &succeed) &&
+      succeed)
+    owner_window_->Close();
 }
 
 void DevToolsDelegate::OpenInNewTab(const std::string& url) {

diff --git a/browser/devtools_delegate.h b/browser/devtools_delegate.h
index be0c1b298e0a9d0cebaa8b63ceadcd21ce42ee86..54e05a25b58780289029046b2f108c09551f292e 100644 (file)
--- a/browser/devtools_delegate.h
+++ b/browser/devtools_delegate.h
@@ -10,6 +10,7 @@
 #include "content/public/browser/devtools_frontend_host_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "vendor/brightray/browser/devtools_embedder_message_dispatcher.h"
+#include "vendor/brightray/browser/inspectable_web_contents_delegate.h"
 
 namespace content {
 class DevToolsAgentHost;
@@ -31,6 +32,10 @@ class DevToolsDelegate : public content::DevToolsFrontendHostDelegate,
                    content::WebContents* target_web_contents);
   virtual ~DevToolsDelegate();
 
+  void SetDelegate(brightray::InspectableWebContentsDelegate* delegate) {
+    delegate_ = delegate;
+  }
+
  protected:
   // Implementations of content::DevToolsFrontendHostDelegate.
   virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE;
@@ -66,6 +71,7 @@ class DevToolsDelegate : public content::DevToolsFrontendHostDelegate,
 
  private:
   NativeWindow* owner_window_;
+  brightray::InspectableWebContentsDelegate* delegate_;
 
   scoped_refptr<content::DevToolsAgentHost> devtools_agent_host_;
   scoped_ptr<content::DevToolsClientHost> devtools_client_host_;

diff --git a/browser/native_window.cc b/browser/native_window.cc
index 177cab7f562c65ced2fbdf044b841bdf6130753e..85396ab7a5d2b8a4058047f6169b4cbdc3b2e34e 100644 (file)
--- a/browser/native_window.cc
+++ b/browser/native_window.cc
@@ -478,26 +478,18 @@ void NativeWindow::Observe(int type,
 
 bool NativeWindow::DevToolsSetDockSide(const std::string& dock_side,
                                        bool* succeed) {
-  if (dock_side != "undocked") {
-    //  Switch to docked mode.
-    if (devtools_window_) {
-      devtools_window_->Close();
-      devtools_window_.reset();
-    }
+  if (dock_side == "undocked") {
+    *succeed = false;
+    return true;
+  } else {
     return false;
   }
-
-  CloseDevTools();
-  devtools_window_ = Debug(GetWebContents())->GetWeakPtr();
-  return true;
 }
 
-bool NativeWindow::DevToolsShow(const std::string& dock_side) {
-  if (dock_side != "undocked")
-    return false;
-
-  devtools_window_ = Debug(GetWebContents())->GetWeakPtr();
-  return true;
+bool NativeWindow::DevToolsShow(std::string* dock_side) {
+  if (*dock_side == "undocked")
+    *dock_side = "bottom";
+  return false;
 }
 
 void NativeWindow::OnCapturePageDone(const CapturePageCallback& callback,

diff --git a/browser/native_window.h b/browser/native_window.h
index 8a0c1ccfe41c2b6b4887d2d1fc69dd7421be8fa5..af763ddb51e41fbc5991bd7fc6063f04c399cebd 100644 (file)
--- a/browser/native_window.h
+++ b/browser/native_window.h
@@ -229,7 +229,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
   // Implementations of brightray::InspectableWebContentsDelegate.
   virtual bool DevToolsSetDockSide(const std::string& dock_side,
                                    bool* succeed) OVERRIDE;
-  virtual bool DevToolsShow(const std::string& side) OVERRIDE;
+  virtual bool DevToolsShow(std::string* dock_side) OVERRIDE;
 
   // Whether window has standard frame.
   bool has_frame_;

diff --git a/vendor/brightray b/vendor/brightray
index 8111949e34a17bbeba9246494326bb891f55df34..1a8afaa87129527f2c41570ee563abb507f2337a 160000 (submodule)
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 8111949e34a17bbeba9246494326bb891f55df34
+Subproject commit 1a8afaa87129527f2c41570ee563abb507f2337a