summaryrefslogtreecommitdiffstats
path: root/views/bubble/bubble_frame_view_unittest.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 22:47:35 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 22:47:35 +0000
commit8c2d99176b5711b0f3ab22550688ab20a8b8ad5f (patch)
tree56b3ad7613c227898b02bd92764c5998c9a877af /views/bubble/bubble_frame_view_unittest.cc
parentfbf5082d76c19aaf11255480414f0bfa67593743 (diff)
downloadchromium_src-8c2d99176b5711b0f3ab22550688ab20a8b8ad5f.zip
chromium_src-8c2d99176b5711b0f3ab22550688ab20a8b8ad5f.tar.gz
chromium_src-8c2d99176b5711b0f3ab22550688ab20a8b8ad5f.tar.bz2
touchui: Fix a crash on consecutive volume/brightness bubble display.
The ownership of NWView/NWViews should not be affected by whether there is a parent widget or not. So use the default ownership. BUG=104152 TEST=manually Review URL: http://codereview.chromium.org/8564021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/bubble/bubble_frame_view_unittest.cc')
-rw-r--r--views/bubble/bubble_frame_view_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/views/bubble/bubble_frame_view_unittest.cc b/views/bubble/bubble_frame_view_unittest.cc
index 5a1619c..500ae4f 100644
--- a/views/bubble/bubble_frame_view_unittest.cc
+++ b/views/bubble/bubble_frame_view_unittest.cc
@@ -54,7 +54,7 @@ gfx::Size SizedBubbleDelegateView::GetPreferredSize() { return kRect.size(); }
TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
BubbleDelegateView* delegate = new SizedBubbleDelegateView();
- scoped_ptr<Widget> widget(BubbleDelegateView::CreateBubble(delegate));
+ Widget* widget(BubbleDelegateView::CreateBubble(delegate));
delegate->Show();
gfx::Point kPtInBound(100, 100);
gfx::Point kPtOutsideBound(1000, 1000);
@@ -62,7 +62,6 @@ TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
EXPECT_EQ(HTCLIENT, bubble_frame_view->NonClientHitTest(kPtInBound));
EXPECT_EQ(HTNOWHERE, bubble_frame_view->NonClientHitTest(kPtOutsideBound));
widget->CloseNow();
- widget.reset();
RunPendingMessages();
}