Reverting 9944.

This change broke ui, interactive and Vista Perf tests. I felt like reverting.
Review URL: http://codereview.chromium.org/24020

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

2 files changed, 2 insertions, 62 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 3629350..8c64d5f 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/debugger/tools_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
@@ -88,7 +87,6 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       renderer_initialized_(false),
       waiting_for_drag_context_response_(false),
       debugger_attached_(false),
-      tools_window_(NULL),
       enable_dom_ui_bindings_(false),
       pending_request_id_(0),
       enable_external_host_bindings_(false),
@@ -98,9 +96,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       run_modal_reply_msg_(NULL),
       has_unload_listener_(false),
       is_waiting_for_unload_ack_(false),
-      are_javascript_messages_suppressed_(false),
-      inspected_process_id_(0),
-      inspected_view_id_(0) {
+      are_javascript_messages_suppressed_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
   if (modal_dialog_event == NULL)
@@ -558,12 +554,6 @@ void RenderViewHost::ShowJavaScriptConsole() {
   Send(new ViewMsg_ShowJavaScriptConsole(routing_id()));
 }
 
-void RenderViewHost::ShowDeveloperTools() {
-  if (!tools_window_.get())
-    tools_window_.reset(new ToolsWindow);
-  tools_window_->Show(process()->host_id(), routing_id());
-}
-
 void RenderViewHost::DragSourceEndedAt(
     int client_x, int client_y, int screen_x, int screen_y) {
   Send(new ViewMsg_DragSourceEndedOrMoved(
@@ -592,16 +582,6 @@ void RenderViewHost::AllowDOMUIBindings() {
       process()->host_id());
 }
 
-void RenderViewHost::SetUpToolsClient(int inspected_process_id,
-                                      int inspected_view_id) {
-  RendererSecurityPolicy::GetInstance()->GrantDOMUIBindings(
-      process()->host_id());
-  Send(new ViewMsg_SetUpToolsClient(routing_id()));
-
-  inspected_process_id_ = inspected_process_id;
-  inspected_view_id_ = inspected_view_id;
-}
-
 void RenderViewHost::AllowExternalHostBindings() {
   enable_external_host_bindings_ = true;
 }
@@ -752,8 +732,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DebuggerOutput, OnDebuggerOutput);
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidDebugAttach, DidDebugAttach);
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ToolsAgentMsg, OnToolsAgentMsg);
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ToolsClientMsg, OnToolsClientMsg);
     IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction,
                         OnUserMetricsRecordAction)
     IPC_MESSAGE_HANDLER(ViewHostMsg_MissingPluginStatus, OnMissingPluginStatus);
@@ -1193,26 +1171,6 @@ void RenderViewHost::DidDebugAttach() {
   }
 }
 
-void RenderViewHost::OnToolsAgentMsg(int tools_message_type,
-                                     const std::wstring& body) {
-  RenderViewHost* host = RenderViewHost::FromID(inspected_process_id_,
-                                                inspected_view_id_);
-  CHECK(host);
-  if (host) {
-    host->Send(new ViewMsg_ToolsAgentMsg(
-        inspected_view_id_, tools_message_type, body));
-  }
-}
-
-void RenderViewHost::OnToolsClientMsg(int tools_message_type,
-                                      const std::wstring& body) {
-  if (!tools_window_.get()) {
-    NOTREACHED();
-    return;
-  }
-  tools_window_->SendToolsClientMessage(tools_message_type, body);
-}
-
 void RenderViewHost::OnUserMetricsRecordAction(const std::wstring& action) {
   UserMetrics::RecordComputedAction(action.c_str(), process()->profile());
 }
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index dbd18a1..2f36219 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -26,7 +26,6 @@ class NavigationEntry;
 class RenderViewHostDelegate;
 class SiteInstance;
 class SkBitmap;
-class ToolsWindow;
 class ViewMsg_Navigate;
 struct ContextMenuParams;
 struct ViewHostMsg_DidPrintPage_Params;
@@ -292,9 +291,6 @@ class RenderViewHost : public RenderWidgetHost {
   // Show the JavaScript console.
   void ShowJavaScriptConsole();
 
-  // Show the Web Inspector.
-  void ShowDeveloperTools();
-
   // Notifies the renderer that a drop occurred. This is necessary because the
   // render may be the one that started the drag.
   void DragSourceEndedAt(
@@ -324,11 +320,6 @@ class RenderViewHost : public RenderWidgetHost {
   // Must be called before CreateRenderView().
   void AllowDOMUIBindings();
 
-  // Tell the render view to connect as a tools client to the specified
-  // renderer. Must be called when RenderView is created but before any
-  // navigation.
-  void SetUpToolsClient(int inspected_process_id, int inspected_view_id);
-
   // Sets a property with the given name and value on the DOM UI binding object.
   // Must call AllowDOMUIBindings() on this renderer first.
   void SetDOMUIProperty(const std::string& name, const std::string& value);
@@ -515,8 +506,6 @@ class RenderViewHost : public RenderWidgetHost {
                              const std::wstring& source_id);
   void OnDebuggerOutput(const std::wstring& output);
   void DidDebugAttach();
-  void OnToolsAgentMsg(int tools_message_type, const std::wstring& body);
-  void OnToolsClientMsg(int tools_message_type, const std::wstring& body);
   void OnUserMetricsRecordAction(const std::wstring& action);
   void OnMissingPluginStatus(int status);
   void OnMessageReceived(IPC::Message* msg) { }
@@ -572,12 +561,9 @@ class RenderViewHost : public RenderWidgetHost {
   // information.
   bool waiting_for_drag_context_response_;
 
-  // If the debugger attached to us or not.
+  // is the debugger attached to us or not
   bool debugger_attached_;
 
-  // Allows to show exactly one developer tools window for this render view.
-  scoped_ptr<ToolsWindow> tools_window_;
-
   // True if we've been told to set up the the Javascript bindings for
   // sending messages back to the browser.
   bool enable_dom_ui_bindings_;
@@ -624,10 +610,6 @@ class RenderViewHost : public RenderWidgetHost {
 
   bool are_javascript_messages_suppressed_;
 
-  int inspected_process_id_;
-
-  int inspected_view_id_;
-
   DISALLOW_EVIL_CONSTRUCTORS(RenderViewHost);
 };