DevTools: Migrate to new WebKit console API.

Review URL: http://codereview.chromium.org/125244

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18610 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 65 deletions

diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index 562a84a..e029eef 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -1039,24 +1039,6 @@ devtools.CallFrame = function() {
 
 
 /**
- * This method is called by
- * WebInspector.ScriptsPanel.evaluateInSelectedCallFrame. This method issues
- * asynchronous evaluate request.
- * TODO(pfeldman): Remove this method once new console API is landed.
- * @param {string} expression An expression to be evaluated in the context of
- *     this call frame.
- * @return {string} User message that the expression is being evaluated.
- */
-devtools.CallFrame.prototype.evaluate = function(expression) {
-  devtools.CallFrame.doEvalInCallFrame(this, expression, function(value) {
-    WebInspector.console.addMessage(new WebInspector.ConsoleCommandResult(
-        value, false /* exception */, null /* commandMessage */));
-  });
-  return 'evaluating...';
-};
-
-
-/**
  * This method issues asynchronous evaluate request, reports result to the
  * callback.
  * @param {devtools.CallFrame} callFrame Call frame to evaluate in.
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index b1aede6..88a770d 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -47,8 +47,6 @@ devtools.ToolsAgent = function() {
       goog.bind(this.addMessageToConsole_, this);
   RemoteToolsAgent.DispatchOnClient =
       goog.bind(this.dispatchOnClient_, this);
-  RemoteToolsAgent.DidGetResourceContent =
-      devtools.Callback.processCallback;
   RemoteToolsAgent.SetResourcesPanelEnabled =
       goog.bind(this.setResourcesPanelEnabled_, this);
   this.debuggerAgent_ = new devtools.DebuggerAgent();
@@ -164,23 +162,6 @@ devtools.ToolsAgent.prototype.evaluate = function(expr) {
 
 
 /**
- * Asynchronously queries for the resource content.
- * @param {number} identifier Resource identifier.
- * @param {function(string):undefined} opt_callback Callback to call when
- *     result is available.
- */
-devtools.ToolsAgent.prototype.getResourceContentAsync = function(identifier,
-    opt_callback) {
-  var resource = WebInspector.resources[identifier];
-  if (!resource) {
-    return;
-  }
-  RemoteToolsAgent.GetResourceContent(
-      devtools.Callback.wrap(opt_callback), identifier);
-};
-
-
-/**
  * Enables / disables resource tracking.
  * @param {boolean} enabled Sets tracking status.
  * @param {boolean} always Determines whether tracking status should be sticky.
@@ -779,10 +760,6 @@ WebInspector.ScriptsPanel.prototype.__defineGetter__(
     WebInspector.searchableViews_);
 
 
-// Console API provisional fix.
-if (WebInspector.Console.prototype.doEvalInWindow) {
-
-
 WebInspector.Console.prototype.doEvalInWindow =
     function(expression, callback) {
   devtools.tools.evaluateJavaScript(expression, callback);
@@ -795,30 +772,6 @@ WebInspector.ScriptsPanel.prototype.doEvalInCallFrame =
 };
 
 
-} else {
-
-// TODO(pfeldman): remove onces https://bugs.webkit.org/attachment.cgi?id=31255
-// is landed and pushed into Chromium.
-
-WebInspector.Console.prototype._evalInInspectedWindow = function(expression) {
-  if (WebInspector.panels.scripts.paused)
-    return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression);
-
-  var console = this;
-  devtools.tools.evaluateJavaScript(expression, function(response, exception) {
-    console.addMessage(new WebInspector.ConsoleCommandResult(
-        response, exception, null /* commandMessage */));
-  });
-  return 'evaluating...';
-};
-
-WebInspector.Console.prototype.completions = function(
-    wordRange, bestMatchOnly) {
-  return null;
-};
-
-}  // end of Console API provisional fix.
-
 (function() {
   var oldShow = WebInspector.ScriptsPanel.prototype.show;
   WebInspector.ScriptsPanel.prototype.show =  function() {