diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 01:10:57 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 01:10:57 +0000 |
| commit | 6cd1403445088bdb2fa63c3eb79faa2c7fcfd221 (patch) | |
| tree | d139d9dc399a8e32d2395be66bdefa9ed724837c /ui/views/widget | |
| parent | 58133865c352d56a38091c7c2f3c8dd2582ca9cd (diff) | |
| download | chromium_src-6cd1403445088bdb2fa63c3eb79faa2c7fcfd221.zip chromium_src-6cd1403445088bdb2fa63c3eb79faa2c7fcfd221.tar.gz chromium_src-6cd1403445088bdb2fa63c3eb79faa2c7fcfd221.tar.bz2 | |
Fix leaks in native_widget_aura and its test.
BUG=none
TEST=chromeos heapcheck bot reports no leaks
Review URL: https://chromiumcodereview.appspot.com/9331009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 3 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura_unittest.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 07fc138..6641b87 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -727,6 +727,9 @@ void NativeWidgetAura::OnWindowDestroying() { // If the aura::Window is destroyed, we can no longer show tooltips. tooltip_manager_.reset(); + + // Cleanup properties associated with the window here. + delete GetRestoreBounds(window_); } void NativeWidgetAura::OnWindowDestroyed() { diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index e7ddf31..2b9f874 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -153,7 +153,7 @@ TEST_F(NativeWidgetAuraTest, GetClientAreaScreenBounds) { Widget::InitParams params(Widget::InitParams::TYPE_WINDOW); params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.bounds.SetRect(10, 20, 300, 400); - Widget* widget = new Widget(); + scoped_ptr<Widget> widget(new Widget()); widget->Init(params); // For Aura, client area bounds match window bounds. |