| Index: chrome/browser/notifications/fullscreen_notification_blocker.cc
|
| diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc
|
| index c394a5b30e09637ae08be21e041dcb7b55f87288..b555a3d2e31aec82bb9fb0e231264c7a4bcd0f98 100644
|
| --- a/chrome/browser/notifications/fullscreen_notification_blocker.cc
|
| +++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc
|
| @@ -71,8 +71,10 @@ void FullscreenNotificationBlocker::CheckState() {
|
|
|
| bool FullscreenNotificationBlocker::ShouldShowNotificationAsPopup(
|
| const message_center::Notification& notification) const {
|
| - bool enabled = !is_fullscreen_mode_ ||
|
| - notification.delegate()->ShouldDisplayOverFullscreen();
|
| + bool enabled = !is_fullscreen_mode_;
|
| + if (is_fullscreen_mode_ && notification.delegate())
|
| + enabled = notification.delegate()->ShouldDisplayOverFullscreen();
|
| +
|
| #if defined(USE_ASH)
|
| if (ash::Shell::HasInstance())
|
| enabled = enabled || ash::system_notifier::ShouldAlwaysShowPopups(
|
|
|