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

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

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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: content/child/notifications/notification_manager.cc
diff --git a/content/child/notifications/notification_manager.cc b/content/child/notifications/notification_manager.cc
index ae02cfcbe2c4687867a39491796c59f8d6cde6a8..75edcb501c961b0ddf379a2d75a2ba9595963a07 100644
--- a/content/child/notifications/notification_manager.cc
+++ b/content/child/notifications/notification_manager.cc
@@ -147,7 +147,7 @@ void NotificationManager::showPersistent(
int request_id =
notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
- pending_show_notification_requests_.AddWithID(owned_callbacks.release(),
+ pending_show_notification_requests_.AddWithID(std::move(owned_callbacks),
request_id);
// TODO(mkwst): This is potentially doing the wrong thing with unique
@@ -162,7 +162,7 @@ void NotificationManager::showPersistent(
void NotificationManager::getNotifications(
const blink::WebString& filter_tag,
blink::WebServiceWorkerRegistration* service_worker_registration,
- blink::WebNotificationGetCallbacks* callbacks) {
+ std::unique_ptr<blink::WebNotificationGetCallbacks> callbacks) {
DCHECK(service_worker_registration);
DCHECK(callbacks);
@@ -179,7 +179,8 @@ void NotificationManager::getNotifications(
int request_id =
notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
- pending_get_notification_requests_.AddWithID(callbacks, request_id);
+ pending_get_notification_requests_.AddWithID(std::move(callbacks),
+ request_id);
thread_safe_sender_->Send(new PlatformNotificationHostMsg_GetNotifications(
request_id, service_worker_registration_id, origin,

Powered by Google App Engine
This is Rietveld 408576698