| Index: chrome/browser/permissions/permission_uma_util.cc
|
| diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc
|
| index efbdf5f04b6c65ff92efbb88a5fa6d95f2c44fb1..6429e5327fc28b00aaa25a5ef2a4535398534346 100644
|
| --- a/chrome/browser/permissions/permission_uma_util.cc
|
| +++ b/chrome/browser/permissions/permission_uma_util.cc
|
| @@ -10,9 +10,16 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/permissions/permission_manager.h"
|
| +#include "chrome/browser/permissions/permission_request.h"
|
| #include "chrome/browser/permissions/permission_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
|
| +#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
| +#include "chrome/browser/safe_browsing/ui_manager.h"
|
| +#include "chrome/browser/sync/profile_sync_service_factory.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| +#include "chrome/common/pref_names.h"
|
| +#include "components/browser_sync/browser/profile_sync_service.h"
|
| +#include "components/prefs/pref_service.h"
|
| #include "components/rappor/rappor_service.h"
|
| #include "components/rappor/rappor_utils.h"
|
| #include "content/public/browser/permission_type.h"
|
| @@ -312,7 +319,7 @@ void PermissionUmaUtil::PermissionRevoked(PermissionType permission,
|
| }
|
|
|
| void PermissionUmaUtil::PermissionPromptShown(
|
| - const std::vector<PermissionBubbleRequest*>& requests) {
|
| + const std::vector<PermissionRequest*>& requests) {
|
| DCHECK(!requests.empty());
|
|
|
| PermissionBubbleType permission_prompt_type = PermissionBubbleType::MULTIPLE;
|
| @@ -334,7 +341,7 @@ void PermissionUmaUtil::PermissionPromptShown(
|
| }
|
|
|
| void PermissionUmaUtil::PermissionPromptAccepted(
|
| - const std::vector<PermissionBubbleRequest*>& requests,
|
| + const std::vector<PermissionRequest*>& requests,
|
| const std::vector<bool>& accept_states) {
|
| DCHECK(!requests.empty());
|
| DCHECK(requests.size() == accept_states.size());
|
| @@ -367,7 +374,7 @@ void PermissionUmaUtil::PermissionPromptAccepted(
|
| }
|
|
|
| void PermissionUmaUtil::PermissionPromptDenied(
|
| - const std::vector<PermissionBubbleRequest*>& requests) {
|
| + const std::vector<PermissionRequest*>& requests) {
|
| DCHECK(!requests.empty());
|
| DCHECK(requests.size() == 1);
|
|
|
|
|