| 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 6c0079e4df9a7bbcf3ae1298bd6959f7872a5420..a9b143dc9e5924db95b0a2df66c7f69e34707464 100644
|
| --- a/chrome/browser/ui/views/global_error_bubble_view.h
|
| +++ b/chrome/browser/ui/views/global_error_bubble_view.h
|
| @@ -6,44 +6,36 @@
|
| #define CHROME_BROWSER_UI_VIEWS_GLOBAL_ERROR_BUBBLE_VIEW_H_
|
| #pragma once
|
|
|
| -#include "chrome/browser/ui/views/bubble/bubble.h"
|
| +#include "views/bubble/bubble_delegate.h"
|
| #include "views/controls/button/button.h"
|
|
|
| class Browser;
|
| class GlobalError;
|
|
|
| -namespace views {
|
| -class Label;
|
| -}
|
| -
|
| -class GlobalErrorBubbleView : public views::View,
|
| - public views::ButtonListener,
|
| - public BubbleDelegate {
|
| +class GlobalErrorBubbleView : public views::ButtonListener,
|
| + public views::BubbleDelegateView {
|
| public:
|
| - GlobalErrorBubbleView(Browser* browser, GlobalError* error);
|
| + GlobalErrorBubbleView(views::View* anchor_view,
|
| + views::BubbleBorder::ArrowLocation location,
|
| + const SkColor& color,
|
| + Browser* browser,
|
| + GlobalError* error);
|
| virtual ~GlobalErrorBubbleView();
|
|
|
| - // views::View implementation.
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + // views::BubbleDelegateView implementation.
|
| + virtual gfx::Point GetAnchorPoint() OVERRIDE;
|
|
|
| // views::ButtonListener implementation.
|
| virtual void ButtonPressed(views::Button* sender,
|
| const views::Event& event) OVERRIDE;
|
|
|
| - // BubbleDelegate implementation.
|
| - virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
|
| - virtual bool CloseOnEscape() OVERRIDE;
|
| - virtual bool FadeInOnShow() OVERRIDE;
|
| -
|
| - void set_bubble(Bubble* bubble) { bubble_ = bubble; }
|
| + // views::WidgetDelegate implementation.
|
| + virtual void WindowClosing() OVERRIDE;
|
|
|
| private:
|
| Browser* browser_;
|
| GlobalError* error_;
|
|
|
| - views::Label* message_label_;
|
| - Bubble* bubble_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(GlobalErrorBubbleView);
|
| };
|
|
|
|
|