| 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..926d6c198be1c55c7ed19b59d264e3b093833310 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,22 @@ 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.
|
| + void Init() override;
|
| bool ShouldShowCloseButton() const override;
|
| + void UpdateButton(views::LabelButton* button, ui::DialogButton type) 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;
|
|
|