| Index: chrome/browser/extensions/api/notifications/notifications_api.cc
|
| diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
|
| index 215c9833793066d22cb29bd74b11d70567bd762f..15f949a5bac812b6a6d76cf93dda0a137add2308 100644
|
| --- a/chrome/browser/extensions/api/notifications/notifications_api.cc
|
| +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
|
| @@ -31,6 +31,9 @@
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "extensions/browser/app_window/app_window.h"
|
| +#include "extensions/browser/app_window/app_window_registry.h"
|
| +#include "extensions/browser/app_window/native_app_window.h"
|
| #include "extensions/browser/event_router.h"
|
| #include "extensions/browser/extension_system_provider.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| @@ -143,6 +146,7 @@ class NotificationsApiDelegate : public NotificationDelegate {
|
| const std::string& id)
|
| : api_function_(api_function),
|
| event_router_(EventRouter::Get(profile)),
|
| + profile_(profile),
|
| extension_id_(extension_id),
|
| id_(id),
|
| scoped_id_(CreateScopedIdentifier(extension_id, id)) {
|
| @@ -188,6 +192,19 @@ class NotificationsApiDelegate : public NotificationDelegate {
|
|
|
| std::string id() const override { return scoped_id_; }
|
|
|
| + // Should only display when fullscreen if this app is the source of the
|
| + // fullscreen window.
|
| + bool ShouldDisplayOverFullscreen() const override {
|
| + AppWindowRegistry::AppWindowList windows =
|
| + AppWindowRegistry::Get(profile_)->GetAppWindowsForApp(extension_id_);
|
| + for (const auto& window : windows) {
|
| + // Window must be fullscreen and visible
|
| + if (window->IsFullscreen() && window->GetBaseWindow()->IsActive())
|
| + return true;
|
| + }
|
| + return false;
|
| + }
|
| +
|
| private:
|
| ~NotificationsApiDelegate() override {}
|
|
|
| @@ -222,6 +239,7 @@ class NotificationsApiDelegate : public NotificationDelegate {
|
| // so make sure to check for a valid pointer before use.
|
| EventRouter* event_router_;
|
|
|
| + Profile* profile_;
|
| const std::string extension_id_;
|
| const std::string id_;
|
| const std::string scoped_id_;
|
|
|