diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 01:20:39 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 01:20:39 +0000 |
| commit | cd8755e9d76a08b0f4360bee29e741077c86a85e (patch) | |
| tree | fa44386c0b8f15197025772bb67556370b7af099 /views/bubble | |
| parent | 546409d853d4dbc6742ccba0876babae0c920b55 (diff) | |
| download | chromium_src-cd8755e9d76a08b0f4360bee29e741077c86a85e.zip chromium_src-cd8755e9d76a08b0f4360bee29e741077c86a85e.tar.gz chromium_src-cd8755e9d76a08b0f4360bee29e741077c86a85e.tar.bz2 | |
Rebase CriticalNotificationBubble on the new views bubble.
Use a LayoutManager instead of manual sizing/layout.
Don't allow bubbles off-screen by default (like old bubbles).
Don't let CriticalNotificationBubble close on deactivate.
BUG=98323
TEST=CriticalNotificationBubble works/acts as before.
Review URL: http://codereview.chromium.org/8334005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/bubble')
| -rw-r--r-- | views/bubble/bubble_delegate.cc | 4 | ||||
| -rw-r--r-- | views/bubble/bubble_delegate_unittest.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/views/bubble/bubble_delegate.cc b/views/bubble/bubble_delegate.cc index d9ef444..c5b27ee 100644 --- a/views/bubble/bubble_delegate.cc +++ b/views/bubble/bubble_delegate.cc @@ -76,7 +76,7 @@ Widget* CreateBorderWidget(BubbleDelegateView* bubble, Widget* parent) { BubbleDelegateView::BubbleDelegateView() : close_on_esc_(true), close_on_deactivate_(true), - allow_bubble_offscreen_(true), + allow_bubble_offscreen_(false), arrow_location_(BubbleBorder::TOP_LEFT), color_(SK_ColorWHITE), border_widget_(NULL), @@ -91,7 +91,7 @@ BubbleDelegateView::BubbleDelegateView( const SkColor& color) : close_on_esc_(true), close_on_deactivate_(true), - allow_bubble_offscreen_(true), + allow_bubble_offscreen_(false), anchor_point_(anchor_point), arrow_location_(arrow_location), color_(color), diff --git a/views/bubble/bubble_delegate_unittest.cc b/views/bubble/bubble_delegate_unittest.cc index 6b13386..5c94b75 100644 --- a/views/bubble/bubble_delegate_unittest.cc +++ b/views/bubble/bubble_delegate_unittest.cc @@ -12,7 +12,8 @@ namespace views { typedef ViewsTestBase BubbleDelegateTest; TEST_F(BubbleDelegateTest, CreateDelegate) { - BubbleDelegateView* bubble_delegate = new BubbleDelegateView(); + BubbleDelegateView* bubble_delegate = new BubbleDelegateView( + gfx::Point(100, 100), BubbleBorder::LEFT_TOP, SK_ColorGREEN); scoped_ptr<Widget> bubble_widget( BubbleDelegateView::CreateBubble(bubble_delegate, NULL)); EXPECT_EQ(bubble_delegate, bubble_widget->widget_delegate()); |