| 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 7eb5373abe5d431f1df999f68caeb17c0748c730..25ea14065b594bf798e55246d686062e3ca4eace 100644
|
| --- a/chrome/browser/permissions/permission_request_impl.cc
|
| +++ b/chrome/browser/permissions/permission_request_impl.cc
|
| @@ -53,6 +53,9 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
|
| #endif
|
| case content::PermissionType::MIDI_SYSEX:
|
| return IDR_ANDROID_INFOBAR_MIDI;
|
| + case content::PermissionType::SENSORS:
|
| + return IDR_ANDROID_INFOBAR_MIDI;
|
| + // TODO(riju):IDR_ANDROID_INFOBAR_SENSORS
|
| case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
|
| return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
|
| default:
|
| @@ -75,6 +78,8 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
|
| #endif
|
| case content::PermissionType::MIDI_SYSEX:
|
| return gfx::VectorIconId::MIDI;
|
| + case content::PermissionType::SENSORS:
|
| + return gfx::VectorIconId::MIDI;
|
| case content::PermissionType::FLASH:
|
| return gfx::VectorIconId::EXTENSION;
|
| default:
|
| @@ -107,6 +112,9 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
|
| case content::PermissionType::FLASH:
|
| message_id = IDS_FLASH_PERMISSION_FRAGMENT;
|
| break;
|
| + case content::PermissionType::SENSORS:
|
| + message_id = IDS_SENSORS_PERMISSION_FRAGMENT;
|
| + break;
|
| default:
|
| NOTREACHED();
|
| return base::string16();
|
| @@ -154,6 +162,8 @@ PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
|
| #endif
|
| case content::PermissionType::MIDI_SYSEX:
|
| return PermissionRequestType::PERMISSION_MIDI_SYSEX;
|
| + case content::PermissionType::SENSORS:
|
| + return PermissionRequestType::PERMISSION_SENSORS;
|
| case content::PermissionType::PUSH_MESSAGING:
|
| return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
|
| #if defined(OS_CHROMEOS)
|
| @@ -185,6 +195,8 @@ ContentSettingsType PermissionRequestImpl::GetContentSettingsType() const {
|
| return CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
|
| case content::PermissionType::MIDI_SYSEX:
|
| return CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
|
| + case content::PermissionType::SENSORS:
|
| + return CONTENT_SETTINGS_TYPE_SENSORS;
|
| #if defined(OS_CHROMEOS)
|
| case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
|
| return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
|
|
|