Revert r10090, which was committed without proper review.

TBR=brettw

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

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

9 files changed, 0 insertions, 68 deletions

diff --git a/chrome/browser/tab_contents/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc
index 50031b1..e6aa1a2 100644
--- a/chrome/browser/tab_contents/tab_contents_factory.cc
+++ b/chrome/browser/tab_contents/tab_contents_factory.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/debugger/debugger_contents.h"
-#include "chrome/browser/debugger/tools_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "chrome/browser/tab_contents/view_source_contents.h"
 #include "chrome/browser/tab_contents/web_contents.h"
@@ -71,9 +70,6 @@ TabContents* TabContents::CreateWithType(TabContentsType type,
     case TAB_CONTENTS_DEBUGGER:
       contents = new DebuggerContents(profile, instance);
       break;
-    case TAB_CONTENTS_TOOLS:
-      contents = new ToolsContents(profile, instance);
-      break;
     case TAB_CONTENTS_DOM_UI:
       contents = new DOMUIContents(profile, instance, NULL);
       break;
@@ -124,9 +120,6 @@ TabContentsType TabContents::TypeForURL(GURL* url) {
   if (DebuggerContents::IsDebuggerUrl(*url))
     return TAB_CONTENTS_DEBUGGER;
 
-  if (ToolsContents::IsToolsUrl(*url))
-    return TAB_CONTENTS_TOOLS;
-
   if (url->SchemeIs(DOMUIContents::GetScheme().c_str()))
     return TAB_CONTENTS_DOM_UI;
 
diff --git a/chrome/browser/tab_contents/tab_contents_type.h b/chrome/browser/tab_contents/tab_contents_type.h
index 6a8afd9..87cd6452 100644
--- a/chrome/browser/tab_contents/tab_contents_type.h
+++ b/chrome/browser/tab_contents/tab_contents_type.h
@@ -21,7 +21,6 @@ enum TabContentsType {
   TAB_CONTENTS_ABOUT_UI,
   TAB_CONTENTS_DEBUGGER,
   TAB_CONTENTS_DOM_UI,
-  TAB_CONTENTS_TOOLS,
   TAB_CONTENTS_NUM_TYPES
 };
 
diff --git a/chrome/browser/tab_contents/web_contents_view.h b/chrome/browser/tab_contents/web_contents_view.h
index f286776..4bf8dca 100644
--- a/chrome/browser/tab_contents/web_contents_view.h
+++ b/chrome/browser/tab_contents/web_contents_view.h
@@ -108,14 +108,6 @@ class WebContentsView : public RenderViewHostDelegate::View {
   // RenderWidgetHost is deleted. Removes |host| from internal maps.
   void RenderWidgetHostDestroyed(RenderWidgetHost* host);
 
-  // Opens developer tools window for the page.
-  virtual void OpenDeveloperTools() = 0;
-
-  // Forwards message to ToolsClient in developer tools window open for this
-  // page.
-  virtual void ForwardMessageToToolsClient(int tools_message_type,
-                                           const std::wstring& body) = 0;
-
   // Find in page --------------------------------------------------------------
 
   // Opens the find in page window if it isn't already open. It will advance to
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.cc b/chrome/browser/tab_contents/web_contents_view_gtk.cc
index 41d5033..22b450f 100644
--- a/chrome/browser/tab_contents/web_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/web_contents_view_gtk.cc
@@ -77,15 +77,6 @@ void WebContentsViewGtk::SizeContents(const gfx::Size& size) {
   NOTIMPLEMENTED();
 }
 
-void WebContentsViewGtk::OpenDeveloperTools() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewGtk::ForwardMessageToToolsClient(int tools_message_type,
-                                                     const std::wstring& body) {
-  NOTIMPLEMENTED();
-}
-
 void WebContentsViewGtk::FindInPage(const Browser& browser,
                                     bool find_next, bool forward_direction) {
   NOTIMPLEMENTED();
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.h b/chrome/browser/tab_contents/web_contents_view_gtk.h
index 2bd347e..a4273f5 100644
--- a/chrome/browser/tab_contents/web_contents_view_gtk.h
+++ b/chrome/browser/tab_contents/web_contents_view_gtk.h
@@ -30,9 +30,6 @@ class WebContentsViewGtk : public WebContentsView {
   virtual void SetPageTitle(const std::wstring& title);
   virtual void Invalidate();
   virtual void SizeContents(const gfx::Size& size);
-  virtual void OpenDeveloperTools();
-  virtual void ForwardMessageToToolsClient(int tools_message_type,
-                                           const std::wstring& body);
   virtual void FindInPage(const Browser& browser,
                           bool find_next, bool forward_direction);
   virtual void HideFindBar(bool end_session);
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.h b/chrome/browser/tab_contents/web_contents_view_mac.h
index 26d59f3..d576605 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.h
+++ b/chrome/browser/tab_contents/web_contents_view_mac.h
@@ -46,9 +46,6 @@ class WebContentsViewMac : public WebContentsView,
   virtual void SetPageTitle(const std::wstring& title);
   virtual void Invalidate();
   virtual void SizeContents(const gfx::Size& size);
-  virtual void OpenDeveloperTools();
-  virtual void ForwardMessageToToolsClient(int tools_message_type,
-                                           const std::wstring& body);
   virtual void FindInPage(const Browser& browser,
                           bool find_next, bool forward_direction);
   virtual void HideFindBar(bool end_session);
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.mm b/chrome/browser/tab_contents/web_contents_view_mac.mm
index 5275993..ba80b54 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/web_contents_view_mac.mm
@@ -99,15 +99,6 @@ void WebContentsViewMac::SizeContents(const gfx::Size& size) {
   NOTIMPLEMENTED();  // Leaving the hack unimplemented.
 }
 
-void WebContentsViewMac::OpenDeveloperTools() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewMac::ForwardMessageToToolsClient(int tools_message_type,
-                                                     const std::wstring& body) {
-  NOTIMPLEMENTED();
-}
- 
 void WebContentsViewMac::FindInPage(const Browser& browser,
                                     bool find_next, bool forward_direction) {
   if (!find_bar_.get()) {
diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc
index be41930..9728ec8 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.cc
+++ b/chrome/browser/tab_contents/web_contents_view_win.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/tools_window.h"
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -217,26 +216,6 @@ void WebContentsViewWin::SizeContents(const gfx::Size& size) {
   WasSized(size);
 }
 
-void WebContentsViewWin::OpenDeveloperTools() {
-  if (!tools_window_.get())
-    tools_window_.reset(new ToolsWindow);
-
-  RenderViewHost* host = web_contents_->render_view_host();
-  if (!host)
-    return;
-
-  tools_window_->Show(host->process()->host_id(), host->routing_id());
-}
-
-void WebContentsViewWin::ForwardMessageToToolsClient(int tools_message_type,
-                                                     const std::wstring& body) {
-  if (!tools_window_.get()) {
-    NOTREACHED() << "Developer tools window is not open.";
-    return;
-  }
-  tools_window_->SendToolsClientMessage(tools_message_type, body);
-}
-
 void WebContentsViewWin::FindInPage(const Browser& browser,
                                     bool find_next, bool forward_direction) {
   if (!find_bar_.get()) {
diff --git a/chrome/browser/tab_contents/web_contents_view_win.h b/chrome/browser/tab_contents/web_contents_view_win.h
index 2c80eaf..a8649d7 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.h
+++ b/chrome/browser/tab_contents/web_contents_view_win.h
@@ -12,7 +12,6 @@
 
 class FindBarWin;
 class SadTabView;
-class ToolsWindow;
 struct WebDropData;
 class WebDropTarget;
 
@@ -41,9 +40,6 @@ class WebContentsViewWin : public WebContentsView,
   virtual void SetPageTitle(const std::wstring& title);
   virtual void Invalidate();
   virtual void SizeContents(const gfx::Size& size);
-  virtual void OpenDeveloperTools();
-  virtual void ForwardMessageToToolsClient(int tools_message_type,
-                                           const std::wstring& body);
   virtual void FindInPage(const Browser& browser,
                           bool find_next, bool forward_direction);
   virtual void HideFindBar(bool end_session);
@@ -112,9 +108,6 @@ class WebContentsViewWin : public WebContentsView,
 
   WebContents* web_contents_;
 
-  // Allows to show exactly one developer tools window for this page.
-  scoped_ptr<ToolsWindow> tools_window_;
-
   // For find in page. This may be NULL if there is no find bar, and if it is
   // non-NULL, it may or may not be visible.
   scoped_ptr<FindBarWin> find_bar_;