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

Unified Diff: content/child/notifications/notification_manager.cc

Issue 1237973005: [WIP] Implement notification sound loader Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | content/child/notifications/notification_sound_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/notifications/notification_manager.cc
diff --git a/content/child/notifications/notification_manager.cc b/content/child/notifications/notification_manager.cc
index e39588e44abff3db1235b61266ddc6f946fb0a86..4efcb3d0cddad592696e21df20b45deda6d0178b 100644
--- a/content/child/notifications/notification_manager.cc
+++ b/content/child/notifications/notification_manager.cc
@@ -71,7 +71,7 @@ void NotificationManager::show(
const blink::WebSerializedOrigin& origin,
const blink::WebNotificationData& notification_data,
blink::WebNotificationDelegate* delegate) {
- if (notification_data.icon.isEmpty()) {
+ if (notification_data.icon.isEmpty() && notification_data.sound.isEmpty()) {
DisplayPageNotification(origin, notification_data, delegate, SkBitmap());
return;
}
@@ -115,7 +115,7 @@ void NotificationManager::showPersistent(
return;
}
- if (notification_data.icon.isEmpty()) {
+ if (notification_data.icon.isEmpty() && notification_data.sound.isEmpty()) {
DisplayPersistentNotification(origin,
notification_data,
service_worker_registration_id,
« no previous file with comments | « no previous file | content/child/notifications/notification_sound_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698