| Index: chrome/browser/ui/views/confirm_bubble_view.h
|
| diff --git a/chrome/browser/ui/views/confirm_bubble_view.h b/chrome/browser/ui/views/confirm_bubble_view.h
|
| index 61d802e10f0eb1af484458fb4e15fe21537c729d..f0abdd3bd7494defeecaa8b1a6257a1c233523a2 100644
|
| --- a/chrome/browser/ui/views/confirm_bubble_view.h
|
| +++ b/chrome/browser/ui/views/confirm_bubble_view.h
|
| @@ -8,10 +8,9 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/browser/ui/views/bubble/bubble.h"
|
| +#include "ui/views/bubble/bubble_delegate.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/controls/link_listener.h"
|
| -#include "views/view.h"
|
|
|
| class ConfirmBubbleModel;
|
|
|
| @@ -34,21 +33,16 @@ class ConfirmBubbleModel;
|
| // | [OK] [Cancel] |
|
| // +------------------------+
|
| //
|
| -class ConfirmBubbleView : public BubbleDelegate,
|
| +class ConfirmBubbleView : public views::BubbleDelegateView,
|
| public views::ButtonListener,
|
| - public views::LinkListener,
|
| - public views::View {
|
| + public views::LinkListener {
|
| public:
|
| - explicit ConfirmBubbleView(ConfirmBubbleModel* model);
|
| + explicit ConfirmBubbleView(const gfx::Point& anchor_point,
|
| + ConfirmBubbleModel* model);
|
|
|
| protected:
|
| virtual ~ConfirmBubbleView();
|
|
|
| - // BubbleDelegate implementation.
|
| - virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
|
| - virtual bool CloseOnEscape() OVERRIDE;
|
| - virtual bool FadeInOnShow() OVERRIDE;
|
| -
|
| // views::ButtonListener implementation.
|
| virtual void ButtonPressed(views::Button* sender,
|
| const views::Event& event) OVERRIDE;
|
| @@ -56,12 +50,14 @@ class ConfirmBubbleView : public BubbleDelegate,
|
| // views::LinkListener implementation.
|
| virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
|
|
|
| - // views::View implementation.
|
| - virtual void ViewHierarchyChanged(bool is_add,
|
| - views::View* parent,
|
| - views::View* child) OVERRIDE;
|
| + // views::BubbleDelegateView implementation.
|
| + virtual gfx::Point GetAnchorPoint() OVERRIDE;
|
| + virtual void Init() OVERRIDE;
|
|
|
| private:
|
| + // The screen point where this bubble is anchored.
|
| + gfx::Point anchor_point_;
|
| +
|
| // The model to customize this bubble view.
|
| scoped_ptr<ConfirmBubbleModel> model_;
|
|
|
|
|