diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 03:47:49 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 03:47:49 +0000 |
| commit | 8351861274bcfad6e2c3580f7256d8d863ac4f17 (patch) | |
| tree | 1928dda695d59d0377bde27ca4c4a2eeaffca776 /chrome/browser | |
| parent | abd642c12e4e7f4bbfd2ffe4d962d8a8d420b0c7 (diff) | |
| download | chromium_src-8351861274bcfad6e2c3580f7256d8d863ac4f17.zip chromium_src-8351861274bcfad6e2c3580f7256d8d863ac4f17.tar.gz chromium_src-8351861274bcfad6e2c3580f7256d8d863ac4f17.tar.bz2 | |
Fix memory leaks introduced and exposed by r20028.
BUG= none
TEST= none
Review URL: http://codereview.chromium.org/155195
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 514e305..4c72983 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1102,8 +1102,11 @@ void TabStrip::LoadNewTabButtonImage() { // If we don't have a theme provider yet, it means we do not have a // root view, and are therefore in a test. - if (tp == NULL) + bool in_test = false; + if (tp == NULL) { tp = new views::DefaultThemeProvider(); + in_test = true; + } SkBitmap* bitmap = tp->GetBitmapNamed(IDR_NEWTAB_BUTTON); SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND); @@ -1117,6 +1120,8 @@ void TabStrip::LoadNewTabButtonImage() { tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_H)); newtab_button_->SetBackground(color, background, tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK)); + if (in_test) + delete tp; } Tab* TabStrip::GetTabAt(int index) const { |