| Index: chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| index 2cbb3b018d28c282895dbc748e449e85bf55cfb8..072fd0000b6f270753ed4325a430f9e3328e98e2 100644
|
| --- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| +++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/grit/theme_resources.h"
|
| #include "components/infobars/core/infobar.h"
|
| #include "components/url_formatter/elide_url.h"
|
| +#include "content/public/browser/permission_type.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/strings/grit/ui_strings.h"
|
|
|
| @@ -31,10 +32,17 @@ bool GroupedPermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
|
| return PermissionUtil::ShouldShowPersistenceToggle();
|
| }
|
|
|
| -ContentSettingsType GroupedPermissionInfoBarDelegate::GetContentSettingType(
|
| +content::PermissionType GroupedPermissionInfoBarDelegate::GetPermissionType(
|
| size_t position) const {
|
| DCHECK_LT(position, types_.size());
|
| - return types_[position];
|
| + ContentSettingsType type = types_[position];
|
| + if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)
|
| + return content::PermissionType::AUDIO_CAPTURE;
|
| + if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)
|
| + return content::PermissionType::VIDEO_CAPTURE;
|
| +
|
| + NOTREACHED();
|
| + return content::PermissionType::NUM;
|
| }
|
|
|
| int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(
|
|
|