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

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

Issue 8746001: Rebase ConfirmBubble on the new views bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore the ConfirmBubbleModel::Show NativeView argument. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/confirm_bubble_model.cc ('k') | chrome/browser/ui/views/confirm_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/confirm_bubble_model.cc ('k') | chrome/browser/ui/views/confirm_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698