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@22985 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 56 insertions, 0 deletions

diff --git a/chrome/browser/extensions/crashed_extension_infobar.cc b/chrome/browser/extensions/crashed_extension_infobar.cc
new file mode 100644
index 0000000..80ab865
--- /dev/null
+++ b/chrome/browser/extensions/crashed_extension_infobar.cc
@@ -0,0 +1,56 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/extensions/crashed_extension_infobar.h"
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/common/extensions/extension.h"
+#include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+
+CrashedExtensionInfoBarDelegate::CrashedExtensionInfoBarDelegate(
+    TabContents* tab_contents,
+    ExtensionsService* extensions_service,
+    const Extension* extension)
+    : ConfirmInfoBarDelegate(tab_contents),
+      extensions_service_(extensions_service),
+      extension_id_(extension->id()),
+      extension_name_(extension->name()) {
+  DCHECK(extensions_service_);
+  DCHECK(!extension_id_.empty());
+}
+
+std::wstring CrashedExtensionInfoBarDelegate::GetMessageText() const {
+  return l10n_util::GetStringF(IDS_EXTENSION_CRASHED_INFOBAR_MESSAGE,
+      UTF8ToWide(extension_name_));
+}
+
+void CrashedExtensionInfoBarDelegate::InfoBarClosed() {
+  delete this;
+}
+
+SkBitmap* CrashedExtensionInfoBarDelegate::GetIcon() const {
+  // TODO(erikkay): Create extension-specific icon. http://crbug.com/14591
+  return ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_INFOBAR_PLUGIN_CRASHED);
+}
+
+int CrashedExtensionInfoBarDelegate::GetButtons() const {
+  return BUTTON_OK;
+}
+
+std::wstring CrashedExtensionInfoBarDelegate::GetButtonLabel(
+    ConfirmInfoBarDelegate::InfoBarButton button) const {
+  if (button == BUTTON_OK)
+    return l10n_util::GetString(IDS_EXTENSION_CRASHED_INFOBAR_RESTART_BUTTON);
+  return ConfirmInfoBarDelegate::GetButtonLabel(button);
+}
+
+bool CrashedExtensionInfoBarDelegate::Accept() {
+  extensions_service_->ReloadExtension(extension_id_);
+  return true;
+}