chrome/browser/notifications/platform_notification_service_impl.cc - Issue 1320173002: Ship Notifications requireInteraction by default (chromium side)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/platform_notification_service_impl.cc

Issue 1320173002: Ship Notifications requireInteraction by default (chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@requireinteraction1b

Patch Set: Always set title in browsertest Created 5 years, 3 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/notifications/platform_notification_service_browsertest.cc ('k') | chrome/test/data/notifications/platform_notification_service.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/platform_notification_service_impl.cc

diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc

index 2f39c336fc21501d2cdcbdcc3c17bb3b4b927786..867708b798f545864f7f951b7d1232b0977388b4 100644

--- a/chrome/browser/notifications/platform_notification_service_impl.cc

+++ b/chrome/browser/notifications/platform_notification_service_impl.cc

@@ -4,7 +4,6 @@

#include "chrome/browser/notifications/platform_notification_service_impl.h"

-#include "base/command_line.h"

#include "base/metrics/histogram_macros.h"

#include "base/prefs/pref_service.h"

#include "base/strings/utf_string_conversions.h"

@@ -24,7 +23,6 @@

#include "content/public/browser/notification_event_dispatcher.h"

#include "content/public/browser/platform_notification_context.h"

#include "content/public/browser/storage_partition.h"

-#include "content/public/common/content_switches.h"

#include "content/public/common/platform_notification_data.h"

#include "ui/message_center/notifier_settings.h"

#include "url/url_constants.h"

@@ -348,11 +346,8 @@ Notification PlatformNotificationServiceImpl::CreateNotificationFromData(

// On desktop, notifications with require_interaction==true stay on-screen

// rather than minimizing to the notification center after a timeout.

// On mobile, this is ignored (notifications are minimized at all times).

- if (notification_data.require_interaction ||

- !base::CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableExperimentalWebPlatformFeatures)) {

+ if (notification_data.require_interaction)

notification.set_never_timeout(true);

- }

return notification;

}