Push API: Implement and ship PushSubscription.options

content/child/push_messaging/push_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/push_messaging/push_provider.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/push_messaging/push_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/public/common/child_process_host.h"
+#include "content/public/common/push_subscription_options.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
@@ skipping 123 matching lines @@
                         OnGetPermissionStatusError);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
     const GURL& endpoint,
+    const PushSubscriptionOptions& options,
     const std::vector<uint8_t>& p256dh,
     const std::vector<uint8_t>& auth) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(
-      base::WrapUnique(new blink::WebPushSubscription(endpoint, p256dh, auth)));
+  callbacks->onSuccess(base::WrapUnique(new blink::WebPushSubscription(
+      endpoint, options.user_visible_only,
+      blink::WebString::fromLatin1(options.sender_info), p256dh, auth)));
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnSubscribeFromWorkerError(int request_id,
                                               PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
@@ skipping 31 matching lines @@
 
   callbacks->onError(blink::WebPushError(
       error_type, blink::WebString::fromUTF8(error_message)));
 
   unsubscribe_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetSubscriptionSuccess(
     int request_id,
     const GURL& endpoint,
+    const PushSubscriptionOptions& options,
     const std::vector<uint8_t>& p256dh,
     const std::vector<uint8_t>& auth) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(
-      base::WrapUnique(new blink::WebPushSubscription(endpoint, p256dh, auth)));
+  callbacks->onSuccess(base::WrapUnique(new blink::WebPushSubscription(
+      endpoint, options.user_visible_only,
+      blink::WebString::fromLatin1(options.sender_info), p256dh, auth)));

[Peter Beverloo, 2016/07/08 18:30:12]

When moving to Mojo, we'd probably want Blink to think about this as a uint8_t
vector (as that's the natural type there), and Chrome to think about this as an
std::string (as both SW user data and the GCM Driver require that)?

[johnme, 2016/07/13 17:51:57]

Acknowledged. Added a TODO in WebPushSubscriptionOptions.h

 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetSubscriptionError(int request_id,
                                           PushGetRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
@@ skipping 32 matching lines @@
         "supported.";
   }
 
   callbacks->onError(
       blink::WebPushError(error, blink::WebString::fromUTF8(error_message)));
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content