| 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 f83f417dc6587f1b45d7a7506f39129320841f07..acf480b6b7f165a9d049a04b9315f9e06785330b 100644
|
| --- a/chrome/browser/permissions/permission_request_impl.cc
|
| +++ b/chrome/browser/permissions/permission_request_impl.cc
|
| @@ -55,6 +55,8 @@ gfx::VectorIconId PermissionRequestImpl::GetVectorIconId() const {
|
| #endif
|
| case content::PermissionType::MIDI_SYSEX:
|
| return gfx::VectorIconId::MIDI;
|
| + case content::PermissionType::PLUGINS:
|
| + return gfx::VectorIconId::EXTENSION;
|
| default:
|
| NOTREACHED();
|
| return gfx::VectorIconId::VECTOR_ICON_NONE;
|
| @@ -80,6 +82,9 @@ int PermissionRequestImpl::GetIconId() const {
|
| case content::PermissionType::MIDI_SYSEX:
|
| icon_id = IDR_ALLOWED_MIDI_SYSEX;
|
| break;
|
| + case content::PermissionType::PLUGINS:
|
| + icon_id = IDR_ALLOWED_PLUGINS;
|
| + break;
|
| default:
|
| NOTREACHED();
|
| }
|
| @@ -107,6 +112,9 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
|
| message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
|
| break;
|
| #endif
|
| + case content::PermissionType::PLUGINS:
|
| + message_id = IDS_FLASH_PERMISSION_FRAGMENT;
|
| + break;
|
| default:
|
| NOTREACHED();
|
| return base::string16();
|
| @@ -155,6 +163,8 @@ PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
|
| case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
|
| return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
|
| #endif
|
| + case content::PermissionType::PLUGINS:
|
| + return PermissionRequestType::PERMISSION_PLUGINS;
|
| default:
|
| NOTREACHED();
|
| return PermissionRequestType::UNKNOWN;
|
|
|