Push API: Implement and ship PushSubscription.options

content/child/push_messaging/push_provider.h

 // 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.
 
 #ifndef CONTENT_CHILD_PUSH_MESSAGING_PUSH_PROVIDER_H_
 #define CONTENT_CHILD_PUSH_MESSAGING_PUSH_PROVIDER_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/child/push_messaging/push_dispatcher.h"
 #include "content/public/child/worker_thread.h"
 #include "content/public/common/push_messaging_status.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushProvider.h"
 
 class GURL;
 
 namespace blink {
 struct WebPushSubscriptionOptions;
 }
 
 namespace content {
 
 class ThreadSafeSender;
+struct PushSubscriptionOptions;
 
 class PushProvider : public blink::WebPushProvider,
                      public WorkerThread::Observer {
  public:
   ~PushProvider() override;
 
   // The |thread_safe_sender| and |push_dispatcher| are used if calling this
   // leads to construction.
   static PushProvider* ThreadSpecificInstance(
       ThreadSafeSender* thread_safe_sender,
@@ skipping 21 matching lines @@
   // Called by the PushDispatcher.
   bool OnMessageReceived(const IPC::Message& message);
 
  private:
   PushProvider(ThreadSafeSender* thread_safe_sender,
                PushDispatcher* push_dispatcher);
 
   // IPC message handlers.
   void OnSubscribeFromWorkerSuccess(int request_id,
                                     const GURL& endpoint,
+                                    const PushSubscriptionOptions& options,
                                     const std::vector<uint8_t>& p256dh,
                                     const std::vector<uint8_t>& auth);
   void OnSubscribeFromWorkerError(int request_id,
                                   PushRegistrationStatus status);
   void OnUnsubscribeSuccess(int request_id, bool did_unsubscribe);
   void OnUnsubscribeError(int request_id,
                           blink::WebPushError::ErrorType error_type,
                           const std::string& error_message);
   void OnGetSubscriptionSuccess(int request_id,
                                 const GURL& endpoint,
+                                const PushSubscriptionOptions& options,
                                 const std::vector<uint8_t>& p256dh,
                                 const std::vector<uint8_t>& auth);
   void OnGetSubscriptionError(int request_id, PushGetRegistrationStatus status);
   void OnGetPermissionStatusSuccess(int request_id,
                                     blink::WebPushPermissionStatus status);
   void OnGetPermissionStatusError(int request_id,
                                   blink::WebPushError::ErrorType error);
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<PushDispatcher> push_dispatcher_;
@@ skipping 12 matching lines @@
   // the callbacks.
   IDMap<blink::WebPushUnsubscribeCallbacks, IDMapOwnPointer>
       unsubscribe_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(PushProvider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_PUSH_MESSAGING_PUSH_PROVIDER_H_