OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/permissions/permission_uma_util.h" | 5 #include "chrome/browser/permissions/permission_uma_util.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/permissions/permission_decision_auto_blocker.h" |
13 #include "chrome/browser/permissions/permission_manager.h" | 14 #include "chrome/browser/permissions/permission_manager.h" |
14 #include "chrome/browser/permissions/permission_request.h" | 15 #include "chrome/browser/permissions/permission_request.h" |
15 #include "chrome/browser/permissions/permission_util.h" | 16 #include "chrome/browser/permissions/permission_util.h" |
16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 18 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
18 #include "chrome/browser/safe_browsing/ui_manager.h" | 19 #include "chrome/browser/safe_browsing/ui_manager.h" |
19 #include "chrome/browser/sync/profile_sync_service_factory.h" | 20 #include "chrome/browser/sync/profile_sync_service_factory.h" |
20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
21 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
22 #include "components/browser_sync/browser/profile_sync_service.h" | 23 #include "components/browser_sync/browser/profile_sync_service.h" |
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
581 PermissionType permission, | 582 PermissionType permission, |
582 PermissionAction action, | 583 PermissionAction action, |
583 PermissionSourceUI source_ui, | 584 PermissionSourceUI source_ui, |
584 PermissionRequestGestureType gesture_type, | 585 PermissionRequestGestureType gesture_type, |
585 const GURL& requesting_origin, | 586 const GURL& requesting_origin, |
586 Profile* profile) { | 587 Profile* profile) { |
587 if (IsOptedIntoPermissionActionReporting(profile)) { | 588 if (IsOptedIntoPermissionActionReporting(profile)) { |
588 g_browser_process->safe_browsing_service() | 589 g_browser_process->safe_browsing_service() |
589 ->ui_manager() | 590 ->ui_manager() |
590 ->ReportPermissionAction(requesting_origin, permission, action, | 591 ->ReportPermissionAction(requesting_origin, permission, action, |
591 source_ui, gesture_type); | 592 source_ui, gesture_type, |
| 593 PermissionDecisionAutoBlocker::GetDismissCount( |
| 594 requesting_origin, permission, profile), |
| 595 PermissionDecisionAutoBlocker::GetIgnoreCount( |
| 596 requesting_origin, permission, profile)); |
592 } | 597 } |
593 | 598 |
594 bool secure_origin = content::IsOriginSecure(requesting_origin); | 599 bool secure_origin = content::IsOriginSecure(requesting_origin); |
595 | 600 |
596 switch (permission) { | 601 switch (permission) { |
597 case PermissionType::GEOLOCATION: | 602 case PermissionType::GEOLOCATION: |
598 PERMISSION_ACTION_UMA(secure_origin, "Permissions.Action.Geolocation", | 603 PERMISSION_ACTION_UMA(secure_origin, "Permissions.Action.Geolocation", |
599 "Permissions.Action.SecureOrigin.Geolocation", | 604 "Permissions.Action.SecureOrigin.Geolocation", |
600 "Permissions.Action.InsecureOrigin.Geolocation", | 605 "Permissions.Action.InsecureOrigin.Geolocation", |
601 action); | 606 action); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 if (!deprecated_metric.empty() && rappor_service) { | 666 if (!deprecated_metric.empty() && rappor_service) { |
662 rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric, | 667 rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric, |
663 requesting_origin); | 668 requesting_origin); |
664 | 669 |
665 std::string rappor_metric = deprecated_metric + "2"; | 670 std::string rappor_metric = deprecated_metric + "2"; |
666 rappor_service->RecordSample( | 671 rappor_service->RecordSample( |
667 rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE, | 672 rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE, |
668 rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin)); | 673 rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin)); |
669 } | 674 } |
670 } | 675 } |
OLD | NEW |