Commit 8c2d9917 authored by sadrul@chromium.org's avatar sadrul@chromium.org

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
parent fbf5082d
...@@ -22,8 +22,6 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble, Widget* parent) { ...@@ -22,8 +22,6 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble, Widget* parent) {
bubble_params.delegate = bubble; bubble_params.delegate = bubble;
bubble_params.transparent = true; bubble_params.transparent = true;
bubble_params.parent_widget = parent; bubble_params.parent_widget = parent;
if (!bubble_params.parent_widget)
bubble_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
#if defined(OS_WIN) && !defined(USE_AURA) #if defined(OS_WIN) && !defined(USE_AURA)
bubble_params.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS; bubble_params.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS;
bubble_params.transparent = false; bubble_params.transparent = false;
......
...@@ -14,7 +14,7 @@ typedef ViewsTestBase BubbleDelegateTest; ...@@ -14,7 +14,7 @@ typedef ViewsTestBase BubbleDelegateTest;
TEST_F(BubbleDelegateTest, CreateDelegate) { TEST_F(BubbleDelegateTest, CreateDelegate) {
BubbleDelegateView* bubble_delegate = new BubbleDelegateView( BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
NULL, BubbleBorder::NONE, SK_ColorGREEN); NULL, BubbleBorder::NONE, SK_ColorGREEN);
scoped_ptr<Widget> bubble_widget( Widget* bubble_widget(
BubbleDelegateView::CreateBubble(bubble_delegate)); BubbleDelegateView::CreateBubble(bubble_delegate));
EXPECT_EQ(bubble_delegate, bubble_widget->widget_delegate()); EXPECT_EQ(bubble_delegate, bubble_widget->widget_delegate());
EXPECT_EQ(bubble_widget, bubble_delegate->GetWidget()); EXPECT_EQ(bubble_widget, bubble_delegate->GetWidget());
...@@ -25,7 +25,6 @@ TEST_F(BubbleDelegateTest, CreateDelegate) { ...@@ -25,7 +25,6 @@ TEST_F(BubbleDelegateTest, CreateDelegate) {
EXPECT_EQ(bubble_delegate->GetColor(), border->background_color()); EXPECT_EQ(bubble_delegate->GetColor(), border->background_color());
bubble_widget->CloseNow(); bubble_widget->CloseNow();
bubble_widget.reset();
RunPendingMessages(); RunPendingMessages();
} }
......
...@@ -54,7 +54,7 @@ gfx::Size SizedBubbleDelegateView::GetPreferredSize() { return kRect.size(); } ...@@ -54,7 +54,7 @@ gfx::Size SizedBubbleDelegateView::GetPreferredSize() { return kRect.size(); }
TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) { TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
BubbleDelegateView* delegate = new SizedBubbleDelegateView(); BubbleDelegateView* delegate = new SizedBubbleDelegateView();
scoped_ptr<Widget> widget(BubbleDelegateView::CreateBubble(delegate)); Widget* widget(BubbleDelegateView::CreateBubble(delegate));
delegate->Show(); delegate->Show();
gfx::Point kPtInBound(100, 100); gfx::Point kPtInBound(100, 100);
gfx::Point kPtOutsideBound(1000, 1000); gfx::Point kPtOutsideBound(1000, 1000);
...@@ -62,7 +62,6 @@ TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) { ...@@ -62,7 +62,6 @@ TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
EXPECT_EQ(HTCLIENT, bubble_frame_view->NonClientHitTest(kPtInBound)); EXPECT_EQ(HTCLIENT, bubble_frame_view->NonClientHitTest(kPtInBound));
EXPECT_EQ(HTNOWHERE, bubble_frame_view->NonClientHitTest(kPtOutsideBound)); EXPECT_EQ(HTNOWHERE, bubble_frame_view->NonClientHitTest(kPtOutsideBound));
widget->CloseNow(); widget->CloseNow();
widget.reset();
RunPendingMessages(); RunPendingMessages();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment