3 files changed, 3 insertions, 17 deletions
diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index b977c0b..cb2a87720 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -919,14 +919,6 @@ devtools.DebuggerAgent.prototype.handleBacktraceResponse_ = function(msg) {
 
 
 /**
- * Returns current suspended stack.
- */
-devtools.DebuggerAgent.prototype.getCallFrames = function(callback) {
-  return this.callFrames_;
-};
-
-
-/**
  * Evaluates code on given callframe.
  */
 devtools.DebuggerAgent.prototype.evaluateInCallFrame = function(
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 1a18a45..d5ee965 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -40,6 +40,7 @@ devtools.InspectorControllerImpl = function() {
   this.installInjectedScriptDelegate_('pushNodeToFrontend');
   this.installInjectedScriptDelegate_('performSearch');
   this.installInjectedScriptDelegate_('searchCanceled');
+  this.installInjectedScriptDelegate_('openInInspectedWindow');
 };
 goog.inherits(devtools.InspectorControllerImpl,
     devtools.InspectorController);
@@ -235,14 +236,6 @@ devtools.InspectorControllerImpl.prototype.stopProfiling = function() {
 /**
  * @override
  */
-devtools.InspectorControllerImpl.prototype.getCallFrames = function(callback) {
-  callback(devtools.tools.getDebuggerAgent().getCallFrames());
-};
-
-
-/**
- * @override
- */
 devtools.InspectorControllerImpl.prototype.evaluateInCallFrame =
     function(callFrameId, code, callback) {
   devtools.tools.getDebuggerAgent().evaluateInCallFrame(callFrameId, code,
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 9c651fe..779b41f 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -101,7 +101,8 @@ void WebDevToolsAgentImpl::Attach() {
 void WebDevToolsAgentImpl::Detach() {
   // Prevent controller from sending messages to the frontend.
   InspectorController* ic = web_view_impl_->page()->inspectorController();
-  ic->setWindowVisible(false, false);
+  ic->hideHighlight();
+  ic->close();
   DisposeUtilityContext();
   inspector_frontend_script_state_.clear();
   devtools_agent_host_.set(NULL);