From 4deac0de619aa03721e3cadd0622de98c693360e Mon Sep 17 00:00:00 2001
From: "engedy@chromium.org"
 <engedy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 1 Nov 2013 17:20:06 +0000
Subject: 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
---
 chrome/browser/ui/gtk/global_error_bubble.cc | 11 ++++++-----
 chrome/browser/ui/gtk/global_error_bubble.h  |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'chrome/browser/ui/gtk')

diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc
index 562e9b3..224b69d 100644
--- a/chrome/browser/ui/gtk/global_error_bubble.cc
+++ b/chrome/browser/ui/gtk/global_error_bubble.cc
@@ -30,9 +30,10 @@ const int kMinMessageLabelWidth = 250;
 
 }  // namespace
 
-GlobalErrorBubble::GlobalErrorBubble(Browser* browser,
-                                     const base::WeakPtr<GlobalError>& error,
-                                     GtkWidget* anchor)
+GlobalErrorBubble::GlobalErrorBubble(
+    Browser* browser,
+    const base::WeakPtr<GlobalErrorWithStandardBubble>& error,
+    GtkWidget* anchor)
     : browser_(browser),
       bubble_(NULL),
       error_(error),
@@ -153,9 +154,9 @@ void GlobalErrorBubble::CloseBubbleView() {
   bubble_->Close();
 }
 
-GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowBubbleView(
+GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
     Browser* browser,
-    const base::WeakPtr<GlobalError>& error) {
+    const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(
           browser->window()->GetNativeWindow());
diff --git a/chrome/browser/ui/gtk/global_error_bubble.h b/chrome/browser/ui/gtk/global_error_bubble.h
index 1802ff0..3cb5b0b 100644
--- a/chrome/browser/ui/gtk/global_error_bubble.h
+++ b/chrome/browser/ui/gtk/global_error_bubble.h
@@ -16,14 +16,14 @@
 
 typedef struct _GtkWidget GtkWidget;
 
-class GlobalError;
+class GlobalErrorWithStandardBubble;
 class Profile;
 
 class GlobalErrorBubble : public BubbleDelegateGtk,
                           public GlobalErrorBubbleViewBase {
  public:
   GlobalErrorBubble(Browser* browser,
-                    const base::WeakPtr<GlobalError>& error,
+                    const base::WeakPtr<GlobalErrorWithStandardBubble>& error,
                     GtkWidget* anchor);
   virtual ~GlobalErrorBubble();
 
@@ -40,7 +40,7 @@ class GlobalErrorBubble : public BubbleDelegateGtk,
 
   Browser* browser_;
   BubbleGtk* bubble_;
-  base::WeakPtr<GlobalError> error_;
+  base::WeakPtr<GlobalErrorWithStandardBubble> error_;
   std::vector<GtkWidget*> message_labels_;
   int message_width_;
 
-- 
cgit v1.1