Propagate the user gesture bit when requesting push messaging permission.

content/renderer/push_messaging/push_messaging_client.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/renderer/push_messaging/push_messaging_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind_helpers.h"
@@ skipping 28 matching lines @@
 
 PushMessagingClient::~PushMessagingClient() {}
 
 void PushMessagingClient::OnDestruct() {
   delete this;
 }
 
 void PushMessagingClient::Subscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
+    bool user_gesture,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
 
   // If a developer provided an application server key in |options|, skip
   // fetching the manifest.
   if (options.application_server_key.IsEmpty()) {
     RenderFrameImpl::FromRoutingID(routing_id())
         ->manifest_manager()
-        ->GetManifest(base::Bind(
-            &PushMessagingClient::DidGetManifest, base::Unretained(this),
-            service_worker_registration, options, base::Passed(&callbacks)));
+        ->GetManifest(base::Bind(&PushMessagingClient::DidGetManifest,
+                                 base::Unretained(this),
+                                 service_worker_registration, options,
+                                 user_gesture, base::Passed(&callbacks)));
   } else {
     PushSubscriptionOptions content_options;
     content_options.user_visible_only = options.user_visible_only;
     // Just treat the server key as a string of bytes and pass it to the push
     // service.
     content_options.sender_info = options.application_server_key.Latin1();
-    DoSubscribe(service_worker_registration, content_options,
+    DoSubscribe(service_worker_registration, content_options, user_gesture,
                 std::move(callbacks));
   }
 }
 
 void PushMessagingClient::DidGetManifest(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
+    bool user_gesture,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks,
     const GURL& manifest_url,
     const Manifest& manifest,
     const ManifestDebugInfo&) {
   // Get the sender_info from the manifest since it wasn't provided by
   // the caller.
   if (manifest.IsEmpty()) {
     DidSubscribe(std::move(callbacks),
                  PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING,
                  base::nullopt, base::nullopt, base::nullopt, base::nullopt);
     return;
   }
 
   PushSubscriptionOptions content_options;
   content_options.user_visible_only = options.user_visible_only;
   if (!manifest.gcm_sender_id.is_null()) {
     content_options.sender_info =
         base::UTF16ToUTF8(manifest.gcm_sender_id.string());
   }
 
-  DoSubscribe(service_worker_registration, content_options,
+  DoSubscribe(service_worker_registration, content_options, user_gesture,
               std::move(callbacks));
 }
 
 void PushMessagingClient::DoSubscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const PushSubscriptionOptions& options,
+    bool user_gesture,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks) {
   int64_t service_worker_registration_id =
       static_cast<WebServiceWorkerRegistrationImpl*>(
           service_worker_registration)
           ->RegistrationId();
 
   if (options.sender_info.empty()) {
     DidSubscribe(std::move(callbacks), PUSH_REGISTRATION_STATUS_NO_SENDER_ID,
                  base::nullopt, base::nullopt, base::nullopt, base::nullopt);
     return;
   }
 
   DCHECK(push_messaging_manager_);
   push_messaging_manager_->Subscribe(
-      routing_id(), service_worker_registration_id, options,
+      routing_id(), service_worker_registration_id, options, user_gesture,
       // Safe to use base::Unretained because |push_messaging_manager_ |is
       // owned by |this|.
       base::Bind(&PushMessagingClient::DidSubscribe, base::Unretained(this),
                  base::Passed(&callbacks)));
 }
 
 void PushMessagingClient::DidSubscribe(
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks,
     content::PushRegistrationStatus status,
     const base::Optional<GURL>& endpoint,
@@ skipping 12 matching lines @@
     callbacks->OnSuccess(base::MakeUnique<blink::WebPushSubscription>(
         endpoint.value(), options.value().user_visible_only,
         blink::WebString::FromLatin1(options.value().sender_info),
         p256dh.value(), auth.value()));
   } else {
     callbacks->OnError(PushRegistrationStatusToWebPushError(status));
   }
 }
 
 }  // namespace content