Fix "crashed extension" infobar browser crashes.

This is a general rework of how "crashed extension" infobar works
and how the extension is actually recovered after the crash.

TEST=See bug.
http://crbug.com/15888

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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index d72c24a..d7808ad 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -24,6 +24,7 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_started_animation.h"
+#include "chrome/browser/extensions/crashed_extension_infobar.h"
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
@@ -195,6 +196,8 @@ Browser::Browser(Type type, Profile* profile)
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  NotificationService::AllSources());
+  registrar_.Add(this, NotificationType::EXTENSION_PROCESS_CRASHED,
+                 NotificationService::AllSources());
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 
@@ -2081,6 +2084,18 @@ void Browser::Observe(NotificationType type,
       break;
     }
 
+    case NotificationType::EXTENSION_PROCESS_CRASHED: {
+      TabContents* tab_contents = GetSelectedTabContents();
+      if (!tab_contents)
+        break;
+      ExtensionsService* extensions_service =
+          Source<ExtensionsService>(source).ptr();
+      ExtensionHost* extension_host = Details<ExtensionHost>(details).ptr();
+      tab_contents->AddInfoBar(new CrashedExtensionInfoBarDelegate(
+          tab_contents, extensions_service, extension_host->extension()));
+      break;
+    }
+
     case NotificationType::BROWSER_THEME_CHANGED:
       window()->UserChangedTheme();
       break;