Propagate the user gesture bit when requesting push messaging permission.

content/browser/push_messaging/push_messaging_manager.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/browser/push_messaging/push_messaging_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 93 matching lines @@
 struct PushMessagingManager::RegisterData {
   RegisterData();
   RegisterData(RegisterData&& other) = default;
   bool FromDocument() const;
   GURL requesting_origin;
   int64_t service_worker_registration_id;
   PushSubscriptionOptions options;
   SubscribeCallback callback;
   // The following member should only be read if FromDocument() is true.
   int render_frame_id;
+
+  // True if the call to register was made with a user gesture.
+  bool user_gesture;
 };
 
 // Inner core of the PushMessagingManager which lives on the UI thread.
 class PushMessagingManager::Core {
  public:
   Core(const base::WeakPtr<PushMessagingManager>& io_parent,
        int render_process_id);
 
   // Public Register methods on UI thread --------------------------------------
 
@@ skipping 150 matching lines @@
   bindings_.AddBinding(this, std::move(request));
 }
 
 // Subscribe methods on both IO and UI threads, merged in order of use from
 // PushMessagingManager and Core.
 // -----------------------------------------------------------------------------
 
 void PushMessagingManager::Subscribe(int32_t render_frame_id,
                                      int64_t service_worker_registration_id,
                                      const PushSubscriptionOptions& options,
+                                     bool user_gesture,
                                      SubscribeCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // TODO(mvanouwerkerk): Validate arguments?
   RegisterData data;
 
   // Will be ChildProcessHost::kInvalidUniqueID in requests from Service Worker.
   data.render_frame_id = render_frame_id;
 
   data.service_worker_registration_id = service_worker_registration_id;
   data.callback = std::move(callback);
   data.options = options;
+  data.user_gesture = user_gesture;
 
   ServiceWorkerRegistration* service_worker_registration =
       service_worker_context_->GetLiveRegistration(
           data.service_worker_registration_id);
   if (!service_worker_registration ||
       !service_worker_registration->active_version()) {
     SendSubscriptionError(std::move(data),
                           PUSH_REGISTRATION_STATUS_NO_SERVICE_WORKER);
     return;
   }
@@ skipping 192 matching lines @@
 
             return;
           }
 
           // Request push messaging permission (which will fail, since
           // notifications aren't supported in incognito), so the website can't
           // detect whether incognito is active.
           GURL requesting_origin = data.requesting_origin;
           browser_context->GetPermissionManager()->RequestPermission(
               PermissionType::PUSH_MESSAGING, render_frame_host,
-              requesting_origin, false /* user_gesture */,
+              requesting_origin, data.user_gesture,
               base::Bind(
                   &PushMessagingManager::Core::DidRequestPermissionInIncognito,
                   weak_factory_ui_to_ui_.GetWeakPtr(), base::Passed(&data)));
         }
       }
     }
     return;
   }
 
   int64_t registration_id = data.service_worker_registration_id;
   GURL requesting_origin = data.requesting_origin;
   PushSubscriptionOptions options = data.options;
   int render_frame_id = data.render_frame_id;
   if (data.FromDocument()) {
     push_service->SubscribeFromDocument(
         requesting_origin, registration_id, render_process_id_, render_frame_id,
-        options,
+        options, data.user_gesture,
         base::Bind(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(),
                    base::Passed(&data)));
   } else {
     push_service->SubscribeFromWorker(
         requesting_origin, registration_id, options,
         base::Bind(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(),
                    base::Passed(&data)));
   }
 }
 
@@ skipping 498 matching lines @@
              : nullptr;
 }
 
 base::WeakPtr<PushMessagingManager::Core>
 PushMessagingManager::Core::GetWeakPtrFromIOParentConstructor() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return weak_factory_ui_to_ui_.GetWeakPtr();
 }
 
 }  // namespace content