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

Unified Diff: chrome/browser/extensions/api/notifications/extension_notification_handler.cc

Issue 2941743002: Revert of Deprecate native and extension notification delegates. (Closed)
Patch Set: Created 3 years, 6 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
Index: chrome/browser/extensions/api/notifications/extension_notification_handler.cc
diff --git a/chrome/browser/extensions/api/notifications/extension_notification_handler.cc b/chrome/browser/extensions/api/notifications/extension_notification_handler.cc
index 645a1f5ac4edb49dac8b5f55c5d43484f7bfd744..61fc1b8427f650dc2ac3660179e544a9f5959d8c 100644
--- a/chrome/browser/extensions/api/notifications/extension_notification_handler.cc
+++ b/chrome/browser/extensions/api/notifications/extension_notification_handler.cc
@@ -5,28 +5,16 @@
#include "chrome/browser/extensions/api/notifications/extension_notification_handler.h"
#include "base/logging.h"
-#include "base/metrics/histogram_macros.h"
#include "base/strings/nullable_string16.h"
#include "base/strings/string_piece.h"
#include "chrome/browser/extensions/api/notifications/extension_notification_display_helper.h"
#include "chrome/browser/extensions/api/notifications/extension_notification_display_helper_factory.h"
-#include "chrome/browser/notifications/notification_common.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/notifications.h"
-#include "chrome/common/features.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/common/constants.h"
-#include "ui/message_center/notifier_settings.h"
#include "url/gurl.h"
namespace extensions {
-
-namespace notifications = api::notifications;
-
-const base::Feature kAllowFullscreenAppNotificationsFeature{
- "FSNotificationsApp", base::FEATURE_ENABLED_BY_DEFAULT};
namespace {
@@ -111,37 +99,6 @@
NOTREACHED();
}
-// Should only display when fullscreen if this app is the source of the
-// fullscreen window.
-bool ExtensionNotificationHandler::ShouldDisplayOnFullScreen(
- Profile* profile,
- const std::string& origin) {
- DCHECK(profile);
- DCHECK(!GetExtensionId(origin).empty());
- AppWindowRegistry::AppWindowList windows =
- AppWindowRegistry::Get(profile)->GetAppWindowsForApp(
- GetExtensionId(origin));
- for (auto* window : windows) {
- // Window must be fullscreen and visible
- if (window->IsFullscreen() && window->GetBaseWindow()->IsActive()) {
- bool enabled =
- base::FeatureList::IsEnabled(kAllowFullscreenAppNotificationsFeature);
- if (enabled) {
- UMA_HISTOGRAM_ENUMERATION("Notifications.Display_Fullscreen.Shown",
- message_center::NotifierId::APPLICATION,
- message_center::NotifierId::SIZE);
- } else {
- UMA_HISTOGRAM_ENUMERATION("Notifications.Display_Fullscreen.Suppressed",
- message_center::NotifierId::APPLICATION,
- message_center::NotifierId::SIZE);
- }
- return enabled;
- }
- }
-
- return false;
-}
-
void ExtensionNotificationHandler::SendEvent(
Profile* profile,
const std::string& extension_id,

Powered by Google App Engine
This is Rietveld 408576698