Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4178)

Unified Diff: chrome/browser/ui/views/global_error_bubble_view.h

Issue 1846033002: Switch GlobalErrorBubbleView to a BubbleDialogDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix button action Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/global_error_bubble_view.h
diff --git a/chrome/browser/ui/views/global_error_bubble_view.h b/chrome/browser/ui/views/global_error_bubble_view.h
index e1481c8af1460795d9840efd6339be60b4ebe82f..f1d1aa44c152a0da9ecaf9ad7e201e9b068c4754 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.h
+++ b/chrome/browser/ui/views/global_error_bubble_view.h
@@ -8,15 +8,14 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ui/global_error/global_error_bubble_view_base.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
#include "ui/views/controls/button/button.h"
class Browser;
class ElevationIconSetter;
class GlobalErrorWithStandardBubble;
-class GlobalErrorBubbleView : public views::ButtonListener,
- public views::BubbleDelegateView,
+class GlobalErrorBubbleView : public views::BubbleDialogDelegateView,
public GlobalErrorBubbleViewBase {
public:
GlobalErrorBubbleView(
@@ -26,17 +25,20 @@ class GlobalErrorBubbleView : public views::ButtonListener,
const base::WeakPtr<GlobalErrorWithStandardBubble>& error);
~GlobalErrorBubbleView() override;
- // views::ButtonListener implementation.
- void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
// views::WidgetDelegate implementation.
base::string16 GetWindowTitle() const override;
gfx::ImageSkia GetWindowIcon() override;
bool ShouldShowWindowIcon() const override;
void WindowClosing() override;
- // views::BubbleDelegateView implementation.
+ // views::BubbleDialogDelegateView implementation.
bool ShouldShowCloseButton() const override;
+ bool ShouldDefaultButtonBeBlue() const override;
+ base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
+ int GetDialogButtons() const override;
+ bool Cancel() override;
+ bool Accept() override;
+ bool Close() override;
// GlobalErrorBubbleViewBase implementation.
void CloseBubbleView() override;

Powered by Google App Engine
This is Rietveld 408576698