diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 23:40:33 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 23:40:33 +0000 |
| commit | 23b060ece7a2db1ef5b4802d4903f93edb538ae3 (patch) | |
| tree | bf1019aabfceefa4e0b148a66e2e7431bbed5214 /chrome/browser/notifications | |
| parent | 4faecb5987442aa29e73954075f5f3da40730b64 (diff) | |
| download | chromium_src-23b060ece7a2db1ef5b4802d4903f93edb538ae3.zip chromium_src-23b060ece7a2db1ef5b4802d4903f93edb538ae3.tar.gz chromium_src-23b060ece7a2db1ef5b4802d4903f93edb538ae3.tar.bz2 | |
Fix shutdown crash by sending the close notification at a point earlier in the sequence when the NotificationService is still alive.
BUG=44110
TEST=shutdown browser with notification open (need debugger to catch crash)
Review URL: http://codereview.chromium.org/2871009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/balloon_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index 1c8fc17..f3190d5 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -41,7 +41,6 @@ BalloonHost::BalloonHost(Balloon* balloon) void BalloonHost::Shutdown() { if (render_view_host_) { - NotifyDisconnect(); render_view_host_->Shutdown(); render_view_host_ = NULL; } @@ -55,6 +54,7 @@ WebPreferences BalloonHost::GetWebkitPrefs() { void BalloonHost::Close(RenderViewHost* render_view_host) { balloon_->CloseByScript(); + NotifyDisconnect(); } void BalloonHost::RenderViewCreated(RenderViewHost* render_view_host) { |