6 files changed, 8 insertions, 28 deletions
diff --git a/content/browser/debugger/devtools_frontend_host.cc b/content/browser/debugger/devtools_frontend_host.cc
index f55cc9a..5df013a 100644
--- a/content/browser/debugger/devtools_frontend_host.cc
+++ b/content/browser/debugger/devtools_frontend_host.cc
@@ -70,9 +70,6 @@ bool DevToolsFrontendHost::OnMessageReceived(
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_ActivateWindow, OnActivateWindow)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_CloseWindow, OnCloseWindow)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_MoveWindow, OnMoveWindow)
-    IPC_MESSAGE_HANDLER(DevToolsHostMsg_RequestDockWindow, OnRequestDockWindow)
-    IPC_MESSAGE_HANDLER(DevToolsHostMsg_RequestUndockWindow,
-                        OnRequestUndockWindow)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_RequestSetDockSide,
                         OnRequestSetDockSide)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_OpenInNewTab, OnOpenInNewTab)
@@ -118,14 +115,6 @@ void DevToolsFrontendHost::OnAppend(
   delegate_->AppendToFile(url, content);
 }
 
-void DevToolsFrontendHost::OnRequestDockWindow() {
-  delegate_->DockWindow();
-}
-
-void DevToolsFrontendHost::OnRequestUndockWindow() {
-  delegate_->UndockWindow();
-}
-
 void DevToolsFrontendHost::OnRequestSetDockSide(const std::string& side) {
   delegate_->SetDockSide(side);
 }
diff --git a/content/browser/debugger/devtools_frontend_host.h b/content/browser/debugger/devtools_frontend_host.h
index fc60556..5c2a936 100644
--- a/content/browser/debugger/devtools_frontend_host.h
+++ b/content/browser/debugger/devtools_frontend_host.h
@@ -44,8 +44,6 @@ class DevToolsFrontendHost : public DevToolsClientHost,
   void OnActivateWindow();
   void OnCloseWindow();
   void OnMoveWindow(int x, int y);
-  void OnRequestDockWindow();
-  void OnRequestUndockWindow();
   void OnRequestSetDockSide(const std::string& side);
   void OnOpenInNewTab(const std::string& url);
   void OnSave(const std::string& url, const std::string& content, bool save_as);
diff --git a/content/common/devtools_messages.h b/content/common/devtools_messages.h
index 9acaf5d..a472e35 100644
--- a/content/common/devtools_messages.h
+++ b/content/common/devtools_messages.h
@@ -118,12 +118,6 @@ IPC_MESSAGE_ROUTED2(DevToolsHostMsg_MoveWindow,
                     int /* x */,
                     int /* y */)
 
-// Attaches dev tools window that is inspecting current render_view_host.
-IPC_MESSAGE_ROUTED0(DevToolsHostMsg_RequestDockWindow)
-
-// Detaches dev tools window that is inspecting current render_view_host.
-IPC_MESSAGE_ROUTED0(DevToolsHostMsg_RequestUndockWindow)
-
 // Specifies side for devtools to dock to.
 IPC_MESSAGE_ROUTED1(DevToolsHostMsg_RequestSetDockSide,
                     std::string /* side */)
diff --git a/content/public/browser/devtools_frontend_host_delegate.h b/content/public/browser/devtools_frontend_host_delegate.h
index 34d065a..265f3d1 100644
--- a/content/public/browser/devtools_frontend_host_delegate.h
+++ b/content/public/browser/devtools_frontend_host_delegate.h
@@ -25,13 +25,6 @@ class DevToolsFrontendHostDelegate {
   // Moves DevTols front-end windo.
   virtual void MoveWindow(int x, int y) = 0;
 
-  // Attaches DevTools front-end to the inspected page.
-  virtual void DockWindow() = 0;
-
-  // Detaches DevTools front-end from the inspected page and places it in its
-  // own window.
-  virtual void UndockWindow() = 0;
-
   // Specifies side for devtools to dock to.
   virtual void SetDockSide(const std::string& side) = 0;
 
diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc
index ae293e3..5a2677c 100644
--- a/content/renderer/devtools_client.cc
+++ b/content/renderer/devtools_client.cc
@@ -62,15 +62,20 @@ void DevToolsClient::moveWindowBy(const WebKit::WebFloatPoint& offset) {
   Send(new DevToolsHostMsg_MoveWindow(routing_id(), offset.x, offset.y));
 }
 
+// TODO(pfeldman): remove once migrated to SetDockSide.
 void DevToolsClient::requestDockWindow() {
-  Send(new DevToolsHostMsg_RequestDockWindow(routing_id()));
+  if (last_dock_side_.empty())
+    last_dock_side_ = "bottom";
+  Send(new DevToolsHostMsg_RequestSetDockSide(routing_id(), last_dock_side_));
 }
 
+// TODO(pfeldman): remove once migration to SetDockSide.
 void DevToolsClient::requestUndockWindow() {
-  Send(new DevToolsHostMsg_RequestUndockWindow(routing_id()));
+  Send(new DevToolsHostMsg_RequestSetDockSide(routing_id(), "undocked"));
 }
 
 void DevToolsClient::requestSetDockSide(const WebKit::WebString& side) {
+  last_dock_side_ = side.utf8();
   Send(new DevToolsHostMsg_RequestSetDockSide(routing_id(), side.utf8()));
 }
 
diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools_client.h
index 0fdb3f1..e5113260 100644
--- a/content/renderer/devtools_client.h
+++ b/content/renderer/devtools_client.h
@@ -54,6 +54,7 @@ class DevToolsClient : public content::RenderViewObserver,
   void OnDispatchOnInspectorFrontend(const std::string& message);
 
   scoped_ptr<WebKit::WebDevToolsFrontend> web_tools_frontend_;
+  std::string last_dock_side_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsClient);
 };