Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5103)

Unified Diff: chrome/browser/status_icons/desktop_notification_balloon.cc

Issue 10168008: Show camera and microphone status indicators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated the media_stream_dispatcher_unittest Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/status_icons/desktop_notification_balloon.cc
diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc
index a03d2ff900caf4c01d3a0c88e92e15683e434b9c..a3fc82548a1a1d4a11d24160e7db705c38cd6eae 100644
--- a/chrome/browser/status_icons/desktop_notification_balloon.cc
+++ b/chrome/browser/status_icons/desktop_notification_balloon.cc
@@ -19,6 +19,11 @@
namespace {
void CloseBalloon(const std::string& id) {
+ // The browser process may have gone away during shutting down, in this case
+ // notification_ui_manager() will close the balloon in its destructor.
+ if (!g_browser_process)
+ return;
+
g_browser_process->notification_ui_manager()->CancelById(id);
}
« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698