diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:37:10 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:37:10 +0000 |
| commit | 4c616541cf6e73dfebaf3cd68128c1e49e7d111b (patch) | |
| tree | 416afc64dc37a1438e87eb9eb80c2c06494754cb /ash/tooltips | |
| parent | 1e0771efa8db5353eea04c3e29781e7e902edd02 (diff) | |
| download | chromium_src-4c616541cf6e73dfebaf3cd68128c1e49e7d111b.zip chromium_src-4c616541cf6e73dfebaf3cd68128c1e49e7d111b.tar.gz chromium_src-4c616541cf6e73dfebaf3cd68128c1e49e7d111b.tar.bz2 | |
* Widget with WIDGET_OWNS_NATIVE_WIDGET has to be deleted explicitly.
* Delegate needs to be deleted but window has to be deleted prior to it.
* a few minor leak fixes.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9350013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 9f3e19a..84d9e95 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -105,9 +105,9 @@ TEST_F(TooltipControllerTest, NonNullTooltipClient) { } TEST_F(TooltipControllerTest, ViewTooltip) { - views::Widget* widget = CreateNewWidget(); + scoped_ptr<views::Widget> widget(CreateNewWidget()); TooltipTestView* view = new TooltipTestView; - AddViewToWidgetAndResize(widget, view); + AddViewToWidgetAndResize(widget.get(), view); view->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText()); EXPECT_EQ(NULL, GetTooltipWindow()); @@ -137,15 +137,15 @@ TEST_F(TooltipControllerTest, ViewTooltip) { } TEST_F(TooltipControllerTest, TooltipsInMultipleViews) { - views::Widget* widget = CreateNewWidget(); + scoped_ptr<views::Widget> widget(CreateNewWidget()); TooltipTestView* view1 = new TooltipTestView; - AddViewToWidgetAndResize(widget, view1); + AddViewToWidgetAndResize(widget.get(), view1); view1->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText()); EXPECT_EQ(NULL, GetTooltipWindow()); TooltipTestView* view2 = new TooltipTestView; - AddViewToWidgetAndResize(widget, view2); + AddViewToWidgetAndResize(widget.get(), view2); aura::Window* window = widget->GetNativeView(); @@ -182,9 +182,9 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) { } TEST_F(TooltipControllerTest, EnableOrDisableTooltips) { - views::Widget* widget = CreateNewWidget(); + scoped_ptr<views::Widget> widget(CreateNewWidget()); TooltipTestView* view = new TooltipTestView; - AddViewToWidgetAndResize(widget, view); + AddViewToWidgetAndResize(widget.get(), view); view->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText()); EXPECT_EQ(NULL, GetTooltipWindow()); |