Index: chrome/browser/content_settings/permission_context_base.cc |
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc |
index 2f62e170dc3554cffd9510356bb1ba6757aa1818..11d08b1fe4f7f4ae824f13cd483409ae029dbd8a 100644 |
--- a/chrome/browser/content_settings/permission_context_base.cc |
+++ b/chrome/browser/content_settings/permission_context_base.cc |
@@ -75,7 +75,6 @@ void PermissionContextBase::DecidePermission( |
default: |
break; |
} |
- |
UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionRequested", |
SettingToPermission(permission_type_), |
PERMISSION_NUM); |
@@ -132,11 +131,16 @@ void PermissionContextBase::PermissionDecided( |
const BrowserPermissionCallback& callback, |
bool persist, |
bool allowed) { |
- UMA_HISTOGRAM_ENUMERATION(allowed |
- ? "ContentSettings.PermissionGranted" |
- : "ContentSettings.PermissionDenied", |
- SettingToPermission(permission_type_), |
- PERMISSION_NUM); |
+ if (allowed) { |
Miguel Garcia
2014/07/08 11:27:25
Since the dependent change has not landed yet I'll
|
+ UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionGranted", |
+ SettingToPermission(permission_type_), |
+ PERMISSION_NUM); |
+ } else { |
+ UMA_HISTOGRAM_ENUMERATION("ContentSettings.PermissionDenied", |
+ SettingToPermission(permission_type_), |
+ PERMISSION_NUM); |
+ } |
+ |
NotifyPermissionSet( |
id, requesting_origin, embedder_origin, callback, persist, allowed); |
} |