4 files changed, 0 insertions, 41 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index e6fbba1..98f03f9 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -199,9 +199,6 @@ TabContents::TabContents(Profile* profile,
   view_->CreateView(base_tab_contents ?
       base_tab_contents->view()->GetContainerSize() : gfx::Size());
 
-  registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-                 NotificationService::AllSources());
-
   // Can only add observers after render_manager_.Init() is called, since that's
   // what sets up the render_view_host which TabContentObserver's constructor
   // uses to get the routing_id.
@@ -211,9 +208,6 @@ TabContents::TabContents(Profile* profile,
 TabContents::~TabContents() {
   is_being_destroyed_ = true;
 
-  // We don't want any notifications while we're running our destructor.
-  registrar_.RemoveAll();
-
   // Clear out any JavaScript state.
   if (delegate_)
     delegate_->GetJavaScriptDialogCreator()->ResetJavaScriptState(this);
@@ -1810,20 +1804,6 @@ bool TabContents::CreateRenderViewForRenderManager(
   return true;
 }
 
-void TabContents::Observe(int type,
-                          const NotificationSource& source,
-                          const NotificationDetails& details) {
-  switch (type) {
-    case content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED:
-      view_->RenderWidgetHostDestroyed(Source<RenderWidgetHost>(source).ptr());
-      break;
-    default:
-      NOTREACHED();
-  }
-}
-
-// Overridden from JavaScriptDialogDelegate
-
 void TabContents::OnDialogClosed(IPC::Message* reply_msg,
                                  bool success,
                                  const string16& user_input) {
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 63e7506..018fc7a 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -23,7 +23,6 @@
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/browser/webui/web_ui.h"
-#include "content/common/notification_registrar.h"
 #include "content/common/property_bag.h"
 #include "content/common/renderer_preferences.h"
 #include "net/base/load_states.h"
@@ -58,7 +57,6 @@ class WebUI;
 // Describes what goes in the main content area of a tab. TabContents is
 // the only type of TabContents, and these should be merged together.
 class TabContents : public PageNavigator,
-                    public NotificationObserver,
                     public RenderViewHostDelegate,
                     public RenderViewHostManager::Delegate,
                     public content::JavaScriptDialogDelegate,
@@ -699,12 +697,6 @@ class TabContents : public PageNavigator,
   virtual bool CreateRenderViewForRenderManager(
       RenderViewHost* render_view_host);
 
-  // NotificationObserver ------------------------------------------------------
-
-  virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
   // NetworkChangeNotifier::OnlineStateObserver:
   virtual void OnOnlineStateChanged(bool online);
 
@@ -732,9 +724,6 @@ class TabContents : public PageNavigator,
   // Manages creation and swapping of render views.
   RenderViewHostManager render_manager_;
 
-  // Registers and unregisters us for notifications.
-  NotificationRegistrar registrar_;
-
   // Data for loading state ----------------------------------------------------
 
   // Indicates whether we're currently loading a resource.
diff --git a/content/browser/tab_contents/tab_contents_view.cc b/content/browser/tab_contents/tab_contents_view.cc
index 0019441..7458f54 100644
--- a/content/browser/tab_contents/tab_contents_view.cc
+++ b/content/browser/tab_contents/tab_contents_view.cc
@@ -20,12 +20,6 @@ TabContentsView::TabContentsView(TabContents* tab_contents)
 
 TabContentsView::~TabContentsView() {}
 
-void TabContentsView::RenderWidgetHostDestroyed(RenderWidgetHost* host) {
-  if (host->view())
-    host->view()->WillDestroyRenderWidget(host);
-  delegate_view_helper_.RenderWidgetHostDestroyed(host);
-}
-
 void TabContentsView::CreateNewWindow(
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
diff --git a/content/browser/tab_contents/tab_contents_view.h b/content/browser/tab_contents/tab_contents_view.h
index 1e6d73f..16ae3ab 100644
--- a/content/browser/tab_contents/tab_contents_view.h
+++ b/content/browser/tab_contents/tab_contents_view.h
@@ -93,10 +93,6 @@ class TabContentsView : public RenderViewHostDelegate::View {
   // TabContents without the special code.
   virtual void SizeContents(const gfx::Size& size) = 0;
 
-  // Invoked from the platform dependent web contents view when a
-  // RenderWidgetHost is deleted. Removes |host| from internal maps.
-  void RenderWidgetHostDestroyed(RenderWidgetHost* host);
-
   // Invoked when the TabContents is notified that the RenderView has been
   // fully created.
   virtual void RenderViewCreated(RenderViewHost* host) {}