Refactored GlobalError to allow having custom bubble UI or no bubble at all.

BUG=298036

Review URL: https://codereview.chromium.org/27173002

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

1 files changed, 9 insertions, 34 deletions

diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc
index 59edff7..3ef80c4 100644
--- a/chrome/browser/extensions/extension_warning_badge_service.cc
+++ b/chrome/browser/extensions/extension_warning_badge_service.cc
@@ -32,13 +32,9 @@ class ErrorBadge : public GlobalError {
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
 
   virtual bool HasBubbleView() OVERRIDE;
-  virtual string16 GetBubbleViewTitle() OVERRIDE;
-  virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
-  virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
-  virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
-  virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
-  virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE;
-  virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE;
+  virtual bool HasShownBubbleView() OVERRIDE;
+  virtual void ShowBubbleView(Browser* browser) OVERRIDE;
+  virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE;
 
   static int GetMenuItemCommandID();
 
@@ -73,35 +69,14 @@ void ErrorBadge::ExecuteMenuItem(Browser* browser) {
   chrome::ExecuteCommand(browser, IDC_MANAGE_EXTENSIONS);
 }
 
-bool ErrorBadge::HasBubbleView() {
-  return false;
-}
-
-string16 ErrorBadge::GetBubbleViewTitle() {
-  return string16();
-}
+bool ErrorBadge::HasBubbleView() { return false; }
 
-std::vector<string16> ErrorBadge::GetBubbleViewMessages() {
-  return std::vector<string16>();
-}
-
-string16 ErrorBadge::GetBubbleViewAcceptButtonLabel() {
-  return string16();
-}
+bool ErrorBadge::HasShownBubbleView() { return false; }
 
-string16 ErrorBadge::GetBubbleViewCancelButtonLabel() {
-  return string16();
-}
-
-void ErrorBadge::OnBubbleViewDidClose(Browser* browser) {
-}
-
-void ErrorBadge::BubbleViewAcceptButtonPressed(Browser* browser) {
-  NOTREACHED();
-}
+void ErrorBadge::ShowBubbleView(Browser* browser) { NOTREACHED(); }
 
-void ErrorBadge::BubbleViewCancelButtonPressed(Browser* browser) {
-  NOTREACHED();
+GlobalErrorBubbleViewBase* ErrorBadge::GetBubbleView() {
+  return NULL;
 }
 
 // static
@@ -168,4 +143,4 @@ void ExtensionWarningBadgeService::ShowBadge(bool show) {
   }
 }
 
-}  // extensions
+}  // namespace extensions