| Index: chrome/browser/permissions/permission_request_impl.cc
|
| diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
|
| index a9d63b324eaeac0486331370a74d31ed56bd6ab9..91dc2df4e9f5ec72cdabcc88ecc0b7ec3a98640e 100644
|
| --- a/chrome/browser/permissions/permission_request_impl.cc
|
| +++ b/chrome/browser/permissions/permission_request_impl.cc
|
| @@ -41,6 +41,7 @@ gfx::VectorIconId PermissionRequestImpl::GetVectorIconId() const {
|
| return gfx::VectorIconId::LOCATION_ON;
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| case content::PermissionType::NOTIFICATIONS:
|
| + case content::PermissionType::PUSH_MESSAGING:
|
| return gfx::VectorIconId::NOTIFICATIONS;
|
| #endif
|
| #if defined(OS_CHROMEOS)
|
| @@ -68,6 +69,7 @@ int PermissionRequestImpl::GetIconId() const {
|
| break;
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| case content::PermissionType::NOTIFICATIONS:
|
| + case content::PermissionType::PUSH_MESSAGING:
|
| icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
|
| break;
|
| #endif
|
| @@ -89,15 +91,13 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
|
| break;
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| case content::PermissionType::NOTIFICATIONS:
|
| + case content::PermissionType::PUSH_MESSAGING:
|
| message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
|
| break;
|
| #endif
|
| case content::PermissionType::MIDI_SYSEX:
|
| message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
|
| break;
|
| - case content::PermissionType::PUSH_MESSAGING:
|
| - message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
|
| - break;
|
| #if defined(OS_CHROMEOS)
|
| case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
|
| message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
|
|
|