Index: chrome/browser/media/media_stream_infobar_delegate_android.cc |
diff --git a/chrome/browser/media/media_stream_infobar_delegate_android.cc b/chrome/browser/media/media_stream_infobar_delegate_android.cc |
index 2bfc3a0671589675ffa7ebc652f38a7ccaf25811..a23a92894a8656e579b1105033cfdea730064815 100644 |
--- a/chrome/browser/media/media_stream_infobar_delegate_android.cc |
+++ b/chrome/browser/media/media_stream_infobar_delegate_android.cc |
@@ -11,6 +11,7 @@ |
#include "base/metrics/histogram.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/infobars/infobar_service.h" |
+#include "chrome/browser/permissions/permission_uma_util.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
#include "components/content_settings/core/common/content_settings_types.h" |
@@ -106,12 +107,28 @@ bool MediaStreamInfoBarDelegateAndroid::Accept() { |
GetAcceptState(kGroupedInfobarVideoPosition)); |
} else { |
DCHECK_EQ(1, GetPermissionCount()); |
- controller_->PermissionGranted(); |
+ bool persist_permission = true; |
+ if (ShouldShowPersistenceToggle()) { |
+ persist_permission = persist(); |
+ PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle( |
+ controller_->GetPermissionTypeForContentSettingsType( |
+ GetContentSettingType(0)), |
+ persist_permission); |
+ } |
+ controller_->PermissionGranted(persist_permission); |
} |
return true; |
} |
bool MediaStreamInfoBarDelegateAndroid::Cancel() { |
- controller_->PermissionDenied(); |
+ bool persist_permission = true; |
+ if (ShouldShowPersistenceToggle()) { |
+ persist_permission = persist(); |
+ PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle( |
+ controller_->GetPermissionTypeForContentSettingsType( |
+ GetContentSettingType(0)), |
raymes
2016/08/18 06:10:01
How come we only deal with the case when one permi
dominickn
2016/08/18 06:38:20
As discussed, enabling for multiple.
|
+ persist_permission); |
+ } |
+ controller_->PermissionDenied(persist_permission); |
return true; |
} |