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 0d5b350dff4284fa3261cc19d46974585d740f11..9bf2930b8b41d4d6a5164b25a672d29132841a5d 100644 |
--- a/chrome/browser/notifications/fullscreen_notification_blocker.cc |
+++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc |
@@ -13,7 +13,7 @@ |
#include "ash/root_window_controller.h" |
#include "ash/shell.h" |
#include "ash/system/system_notifier.h" |
-#include "ash/wm/window_properties.h" |
+#include "ash/wm/window_state.h" |
#include "ui/aura/root_window.h" |
#include "ui/aura/window.h" |
#endif |
@@ -33,10 +33,13 @@ bool DoesFullscreenModeBlockNotifications() { |
const aura::Window* fullscreen_window = |
controller->GetTopmostFullscreenWindow(); |
- // Should appear notifications if kFullscreenUsesMinimalChromeKey is set, |
- // since shelf/message_center UI is visible in such situation. |
- return fullscreen_window && !fullscreen_window->GetProperty( |
- ash::internal::kFullscreenUsesMinimalChromeKey); |
+ // Notifications should appear if the fullscreen type is |
+ // ash::wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME because the shelf and |
+ // message center UI are visible in this case. |
+ if (!fullscreen_window) |
+ return false; |
+ return ash::wm::GetWindowState(fullscreen_window)->fullscreen_type() != |
+ ash::wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME; |
} |
#endif |