Add gesture type value from desktop prompt to permission report

chrome/browser/permissions/permission_context_base.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 "chrome/browser/permissions/permission_context_base.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 146 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if !defined(OS_ANDROID)
   PermissionRequestManager* permission_request_manager =
       PermissionRequestManager::FromWebContents(web_contents);
   // TODO(felt): sometimes |permission_request_manager| is null. This check is
   // meant to prevent crashes. See crbug.com/457091.
   if (!permission_request_manager)
     return;
   std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl(
-          requesting_origin, permission_type_, profile_, user_gesture,
-          base::Bind(&PermissionContextBase::PermissionDecided,
-                     weak_factory_.GetWeakPtr(), id, requesting_origin,
-                     embedding_origin, callback),
-          base::Bind(&PermissionContextBase::CleanUpRequest,
-                     weak_factory_.GetWeakPtr(), id)));
+      requesting_origin, permission_type_, profile_, user_gesture,
+      base::Bind(&PermissionContextBase::PermissionDecided,
+                 weak_factory_.GetWeakPtr(), id, requesting_origin,
+                 embedding_origin, user_gesture, callback),
+      base::Bind(&PermissionContextBase::CleanUpRequest,
+                 weak_factory_.GetWeakPtr(), id)));
   PermissionRequest* request = request_ptr.get();
 
   bool inserted =
       pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
   DCHECK(inserted) << "Duplicate id " << id.ToString();
   permission_request_manager->AddRequest(request);
 #else
+  // TODO(stefanocs): Pass |user_gesture| to CreateInfoBarRequest to record
+  // permission actions in infobar.
   GetQueueController()->CreateInfoBarRequest(
       id, requesting_origin, embedding_origin,
       base::Bind(&PermissionContextBase::PermissionDecided,
                  weak_factory_.GetWeakPtr(), id, requesting_origin,
-                 embedding_origin, callback,
+                 embedding_origin, user_gesture, callback,
                  // the queue controller takes care of persisting the
                  // permission
                  false));
 #endif
 }
 
 void PermissionContextBase::PermissionDecided(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
+    bool user_gesture,
     const BrowserPermissionCallback& callback,
     bool persist,
     ContentSetting content_setting) {
 #if !defined(OS_ANDROID)
   // Infobar persistence and its related UMA is tracked on the infobar
   // controller directly.
+  PermissionRequestGestureType gesture_type =
+      user_gesture ? PermissionRequestGestureType::GESTURE
+                   : PermissionRequestGestureType::NO_GESTURE;
   if (persist) {
     DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
            content_setting == CONTENT_SETTING_BLOCK);
-    if (content_setting == CONTENT_SETTING_ALLOW)
-      PermissionUmaUtil::PermissionGranted(permission_type_, requesting_origin,
-                                           profile_);
-    else
-      PermissionUmaUtil::PermissionDenied(permission_type_, requesting_origin,
-                                          profile_);
+    if (content_setting == CONTENT_SETTING_ALLOW) {
+      PermissionUmaUtil::PermissionGranted(permission_type_, gesture_type,
+                                           requesting_origin, profile_);
+    } else {
+      PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
+                                          requesting_origin, profile_);
+    }
   } else {
     DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT);
-    PermissionUmaUtil::PermissionDismissed(permission_type_, requesting_origin,
-                                           profile_);
+    PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
+                                           requesting_origin, profile_);
   }
 #endif
 
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       persist, content_setting);
 }
 
 #if defined(OS_ANDROID)
 PermissionQueueController* PermissionContextBase::GetQueueController() {
   return permission_queue_controller_.get();
@@ skipping 49 matching lines @@
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }