Index: views/bubble/bubble_delegate.h |
diff --git a/views/bubble/bubble_delegate.h b/views/bubble/bubble_delegate.h |
index 55eb2e17091bb33be2c019169f0fa839fffdc310..e782b82253bc2225bbaa8269528e701deeb6847f 100644 |
--- a/views/bubble/bubble_delegate.h |
+++ b/views/bubble/bubble_delegate.h |
@@ -90,26 +90,27 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, |
// View overrides: |
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
+ // ui::AnimationDelegate overrides: |
+ virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; |
+ virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; |
+ |
// Perform view initialization on the contents for bubble sizing. |
virtual void Init(); |
+ // Resizes and potentially moves the Bubble to best accommodate the |
+ // contents preferred size. |
+ void SizeToContents(); |
+ |
private: |
FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewBasicTest, NonClientHitTest); |
FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CreateDelegate); |
- // ui::AnimationDelegate overrides: |
- virtual void AnimationEnded(const ui::Animation* animation); |
- virtual void AnimationProgressed(const ui::Animation* animation); |
- |
BubbleFrameView* GetBubbleFrameView() const; |
// Get bubble bounds from the anchor point and client view's preferred size. |
gfx::Rect GetBubbleBounds(); |
#if defined(OS_WIN) && !defined(USE_AURA) |
- // Initialize the border widget needed for Windows native control hosting. |
- void InitializeBorderWidget(Widget* parent_widget); |
- |
// Get bounds for the Windows-only widget that hosts the bubble's contents. |
gfx::Rect GetBubbleClientBounds() const; |
#endif |