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

5 files changed, 13 insertions, 48 deletions

diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 738daf2..6a509cd 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -135,7 +135,7 @@ void ExtensionDisabledDialogDelegate::InstallUIAbort(bool user_initiated) {
 
 // ExtensionDisabledGlobalError -----------------------------------------------
 
-class ExtensionDisabledGlobalError : public GlobalError,
+class ExtensionDisabledGlobalError : public GlobalErrorWithStandardBubble,
                                      public content::NotificationObserver,
                                      public ExtensionUninstallDialog::Delegate {
  public:
@@ -150,7 +150,6 @@ class ExtensionDisabledGlobalError : public GlobalError,
   virtual int MenuItemCommandID() OVERRIDE;
   virtual string16 MenuItemLabel() OVERRIDE;
   virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
-  virtual bool HasBubbleView() OVERRIDE;
   virtual gfx::Image GetBubbleViewIcon() OVERRIDE;
   virtual string16 GetBubbleViewTitle() OVERRIDE;
   virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
@@ -244,10 +243,6 @@ void ExtensionDisabledGlobalError::ExecuteMenuItem(Browser* browser) {
   ShowBubbleView(browser);
 }
 
-bool ExtensionDisabledGlobalError::HasBubbleView() {
-   return true;
-}
-
 gfx::Image ExtensionDisabledGlobalError::GetBubbleViewIcon() {
   return icon_;
 }
diff --git a/chrome/browser/extensions/extension_error_ui_default.cc b/chrome/browser/extensions/extension_error_ui_default.cc
index a5b7067..dce30ec 100644
--- a/chrome/browser/extensions/extension_error_ui_default.cc
+++ b/chrome/browser/extensions/extension_error_ui_default.cc
@@ -70,10 +70,6 @@ void ExtensionErrorUIDefault::ExtensionGlobalError::ExecuteMenuItem(
   NOTREACHED();
 }
 
-bool ExtensionErrorUIDefault::ExtensionGlobalError::HasBubbleView() {
-  return true;
-}
-
 string16 ExtensionErrorUIDefault::ExtensionGlobalError::GetBubbleViewTitle() {
   return error_ui_->GetBubbleViewTitle();
 }
diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h
index 75808aa..6861d56 100644
--- a/chrome/browser/extensions/extension_error_ui_default.h
+++ b/chrome/browser/extensions/extension_error_ui_default.h
@@ -25,7 +25,7 @@ class ExtensionErrorUIDefault : public ExtensionErrorUI {
   virtual void Close() OVERRIDE;
 
  private:
-  class ExtensionGlobalError : public GlobalError {
+  class ExtensionGlobalError : public GlobalErrorWithStandardBubble {
    public:
     explicit ExtensionGlobalError(ExtensionErrorUIDefault* error_ui);
 
@@ -35,7 +35,6 @@ class ExtensionErrorUIDefault : public ExtensionErrorUI {
     virtual int MenuItemCommandID() OVERRIDE;
     virtual string16 MenuItemLabel() OVERRIDE;
     virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
-    virtual bool HasBubbleView() OVERRIDE;
     virtual string16 GetBubbleViewTitle() OVERRIDE;
     virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
     virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
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
diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc
index d277194..75c6974 100644
--- a/chrome/browser/extensions/external_install_ui.cc
+++ b/chrome/browser/extensions/external_install_ui.cc
@@ -90,7 +90,7 @@ class ExternalInstallDialogDelegate
 
 // Only shows a menu item, no bubble. Clicking the menu item shows
 // an external install dialog.
-class ExternalInstallMenuAlert : public GlobalError,
+class ExternalInstallMenuAlert : public GlobalErrorWithStandardBubble,
                                  public content::NotificationObserver {
  public:
   ExternalInstallMenuAlert(ExtensionService* service,
@@ -355,7 +355,7 @@ bool ExternalInstallGlobalError::HasBubbleView() {
 
 gfx::Image ExternalInstallGlobalError::GetBubbleViewIcon() {
   if (prompt_->icon().IsEmpty())
-    return GlobalError::GetBubbleViewIcon();
+    return GlobalErrorWithStandardBubble::GetBubbleViewIcon();
   // Scale icon to a reasonable size.
   return gfx::Image(gfx::ImageSkiaOperations::CreateResizedImage(
       *prompt_->icon().ToImageSkia(),