summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 01:13:56 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 01:13:56 +0000
commit8da48de08e490c3574dc0bd2f3585797c2cfe115 (patch)
treeb8f9d9917437219b48df1d37686b5adc8a920c0d
parent3bd90612003627d268438d4075760188d6c75508 (diff)
downloadchromium_src-8da48de08e490c3574dc0bd2f3585797c2cfe115.zip
chromium_src-8da48de08e490c3574dc0bd2f3585797c2cfe115.tar.gz
chromium_src-8da48de08e490c3574dc0bd2f3585797c2cfe115.tar.bz2
Fix a NULL ptr dereference crash. Happens when launching an "app" with no icon.
BUG=none TEST=manual Review URL: http://codereview.chromium.org/2832086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53889 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/app_launched_animation_win.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/views/app_launched_animation_win.cc b/chrome/browser/views/app_launched_animation_win.cc
index 5637fc5..239157e 100644
--- a/chrome/browser/views/app_launched_animation_win.cc
+++ b/chrome/browser/views/app_launched_animation_win.cc
@@ -120,8 +120,6 @@ void AppLaunchedAnimationWin::OnImageLoaded(SkBitmap* image,
animation_->SetTweenType(Tween::LINEAR);
animation_->Reset(1.0);
animation_->Hide();
- } else {
- popup_->Close();
}
}