diff options
| author | achuith@google.com <achuith@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 22:58:39 +0000 |
|---|---|---|
| committer | achuith@google.com <achuith@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 22:58:39 +0000 |
| commit | 61ea39c456b13b5580dffd54f5dd802f864d0db9 (patch) | |
| tree | 9f6d30b9c8e73a4bd4c4b90b86d0b35be3f39f40 /chrome/browser/bug_report_util.cc | |
| parent | 7b2a87c389a20d15987ffa17d446c76c9b8de242 (diff) | |
| download | chromium_src-61ea39c456b13b5580dffd54f5dd802f864d0db9.zip chromium_src-61ea39c456b13b5580dffd54f5dd802f864d0db9.tar.gz chromium_src-61ea39c456b13b5580dffd54f5dd802f864d0db9.tar.bz2 | |
Do not call SystemNotification::Hide() in SystemNotification dtor. The bug report feedback notification is a Singleton. When it gets destroyed in atExit(), it calls Hide() which touches a non-existant global balloon collection object. We avoid this by requiring that Hide() be explicitly called (which it is everywhere except in bug_report_util.cc).
BUG=6895
TEST=none
Review URL: http://codereview.chromium.org/3803005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bug_report_util.cc')
| -rw-r--r-- | chrome/browser/bug_report_util.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc index fdbbe67..8cc10d7 100644 --- a/chrome/browser/bug_report_util.cc +++ b/chrome/browser/bug_report_util.cc @@ -72,15 +72,17 @@ const size_t kMaxLineCount = 10; const size_t kMaxSystemLogLength = 1024; #endif -} // namespace +} // namespace #if defined(OS_CHROMEOS) class FeedbackNotification { public: - // Previous notification cleanup is handled by scoped_ptr. // Note: notification will show only on one profile at a time. void Show(Profile* profile, const string16& message, bool urgent) { + if (notification_.get()) { + notification_->Hide(); + } notification_.reset( new chromeos::SystemNotification(profile, kNotificationId, IDR_STATUSBAR_FEEDBACK, |