Record permission prompt gesture metrics on Android.

chrome/browser/permissions/permission_queue_controller.cc

 // Copyright 2013 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_queue_controller.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_dialog_delegate.h"
 #include "chrome/browser/permissions/permission_infobar_delegate.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/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 40 matching lines @@
                         const GURL& requesting_frame,
                         const GURL& embedder,
                         bool user_gesture,
                         Profile* profile,
                         const PermissionDecidedCallback& callback);
   ~PendingInfobarRequest();
 
   bool IsForPair(const GURL& requesting_frame,
                  const GURL& embedder) const;
 
+  PermissionRequestType request_type() const {
+    switch (type_) {
+      case content::PermissionType::GEOLOCATION:
+        return PermissionRequestType::PERMISSION_GEOLOCATION;
+#if defined(ENABLE_NOTIFICATIONS)
+      case content::PermissionType::NOTIFICATIONS:
+        return PermissionRequestType::PERMISSION_NOTIFICATIONS;
+#endif
+      case content::PermissionType::MIDI_SYSEX:
+        return PermissionRequestType::PERMISSION_MIDI_SYSEX;
+      case content::PermissionType::PUSH_MESSAGING:
+        return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
+      case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
+        return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;

[benwells, 2016/11/10 03:24:28]

This switch already exists pretty much in permission_request_impl.cc. Could we
put it somewhere common and reuse it?

Edit - looks like you've already put it in PermissionUtil - can yo use that?

[dominickn, 2016/11/10 04:27:07]

Done.

+      default:
+        NOTREACHED();
+        return PermissionRequestType::UNKNOWN;
+    }
+  }
+
+  PermissionRequestGestureType gesture_type() const {
+    return PermissionUtil::GetGestureType(user_gesture_);
+  }
+
   const PermissionRequestID& id() const { return id_; }
   const GURL& requesting_frame() const { return requesting_frame_; }
   bool has_gesture() const { return user_gesture_; }
   bool has_infobar() const { return !!infobar_; }
   bool has_dialog() const { return has_dialog_; }
   infobars::InfoBar* infobar() { return infobar_; }
 
   void RunCallback(ContentSetting content_setting);
   void CreatePrompt(PermissionQueueController* controller, bool show_dialog);
 
@@ skipping 125 matching lines @@
 }
 
 void PermissionQueueController::OnPermissionSet(const PermissionRequestID& id,
                                                 const GURL& requesting_frame,
                                                 const GURL& embedder,
                                                 bool user_gesture,
                                                 bool update_content_setting,
                                                 PermissionAction decision) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // TODO(miguelg): move the permission persistence to

[benwells, 2016/11/10 03:24:28]

is this TODO still valid? Maybe it should move somewhere else - it seems kinda
out of place.

[dominickn, 2016/11/10 04:27:07]

Moved down to the update content setting call.

   // PermissionContextBase once all the types are moved there.
+  PermissionRequestType request_type =
+      PermissionUtil::GetRequestType(permission_type_);
   PermissionRequestGestureType gesture_type =
-      user_gesture ? PermissionRequestGestureType::GESTURE
-                   : PermissionRequestGestureType::NO_GESTURE;
+      PermissionUtil::GetGestureType(user_gesture);
   switch (decision) {
     case GRANTED:
       PermissionUmaUtil::PermissionGranted(permission_type_, gesture_type,
                                            requesting_frame, profile_);
+      PermissionUmaUtil::RecordPermissionPromptAccepted(request_type,
+                                                        gesture_type);
       break;
     case DENIED:
       PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
                                           requesting_frame, profile_);
+      PermissionUmaUtil::RecordPermissionPromptDenied(request_type,
+                                                      gesture_type);
       break;
     case DISMISSED:
       PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
                                              requesting_frame, profile_);
       break;
     default:
       NOTREACHED();
   }
 
   if (update_content_setting)
@@ skipping 119 matching lines @@
   for (PendingInfobarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ++i) {
     if (ArePermissionRequestsForSameTab(i->id(), id) && !i->has_infobar()) {
       // When using modal permission prompts, Java controls the display queue,
       // so infobar notifications are not relevant.
       bool show_dialog =
           PermissionDialogDelegate::ShouldShowDialog(i->has_gesture());
       if (!show_dialog)
         RegisterForInfoBarNotifications(infobar_service);
 
+      PermissionUmaUtil::RecordPermissionPromptShown(i->request_type(),
+                                                     i->gesture_type());
       i->CreatePrompt(this, show_dialog);
       return;
     }
   }
 
   UnregisterForInfoBarNotifications(infobar_service);
 }
 
 void PermissionQueueController::ClearPendingInfobarRequestsForTab(
     const PermissionRequestID& id) {
@@ skipping 43 matching lines @@
   }
 
   ContentSetting content_setting =
       (decision == GRANTED) ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(
           requesting_frame.GetOrigin(), embedder.GetOrigin(),
           content_settings_type_, std::string(), content_setting);
 }