| Index: chrome/browser/permissions/permission_infobar_delegate.cc
|
| diff --git a/chrome/browser/permissions/permission_infobar_delegate.cc b/chrome/browser/permissions/permission_infobar_delegate.cc
|
| index 497ed8579ed992dfe6b6ba1a2db5db2fd8ae080f..f808764f5ba088c8e6b404e40ff56f6d6028e4dc 100644
|
| --- a/chrome/browser/permissions/permission_infobar_delegate.cc
|
| +++ b/chrome/browser/permissions/permission_infobar_delegate.cc
|
| @@ -24,21 +24,19 @@ PermissionInfoBarDelegate::~PermissionInfoBarDelegate() {
|
| PermissionInfoBarDelegate::PermissionInfoBarDelegate(
|
| const GURL& requesting_origin,
|
| content::PermissionType permission_type,
|
| - ContentSettingsType content_settings_type,
|
| bool user_gesture,
|
| Profile* profile,
|
| const PermissionSetCallback& callback)
|
| : requesting_origin_(requesting_origin),
|
| permission_type_(permission_type),
|
| - content_settings_type_(content_settings_type),
|
| profile_(profile),
|
| callback_(callback),
|
| action_taken_(false),
|
| user_gesture_(user_gesture),
|
| persist_(true) {}
|
|
|
| -std::vector<int> PermissionInfoBarDelegate::content_settings() const {
|
| - return std::vector<int>{content_settings_type_};
|
| +std::vector<int> PermissionInfoBarDelegate::permission_types() const {
|
| + return std::vector<int>{static_cast<int>(permission_type_)};
|
| }
|
|
|
| bool PermissionInfoBarDelegate::ShouldShowPersistenceToggle() const {
|
|
|