| Index: chrome/browser/permissions/permission_util.cc
|
| diff --git a/chrome/browser/permissions/permission_util.cc b/chrome/browser/permissions/permission_util.cc
|
| index ed21fe7e912c30c15962dd667bace2344c2f0df8..127ca2f162bb1ab7e0df5cf871e933c15c8b8c01 100644
|
| --- a/chrome/browser/permissions/permission_util.cc
|
| +++ b/chrome/browser/permissions/permission_util.cc
|
| @@ -27,6 +27,8 @@ std::string PermissionUtil::GetPermissionString(
|
| return "Notifications";
|
| case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
|
| return "MidiSysEx";
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| + return "Sensors";
|
| case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
|
| return "PushMessaging";
|
| case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
|
| @@ -59,6 +61,8 @@ std::string PermissionUtil::ConvertContentSettingsTypeToSafeBrowsingName(
|
| return "NOTIFICATIONS";
|
| case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
|
| return "MIDI_SYSEX";
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| + return "Sensors";
|
| case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
|
| return "PUSH_MESSAGING";
|
| case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
|
| @@ -88,6 +92,8 @@ PermissionRequestType PermissionUtil::GetRequestType(ContentSettingsType type) {
|
| return PermissionRequestType::PERMISSION_NOTIFICATIONS;
|
| case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
|
| return PermissionRequestType::PERMISSION_MIDI_SYSEX;
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| + return PermissionRequestType::PERMISSION_SENSORS;
|
| case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
|
| return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
|
| case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
|
| @@ -117,6 +123,18 @@ bool PermissionUtil::GetPermissionType(ContentSettingsType type,
|
| *out = PermissionType::MIDI;
|
| } else if (type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
|
| *out = PermissionType::MIDI_SYSEX;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_SENSORS) {
|
| + *out = PermissionType::SENSORS;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_AMBIENT_LIGHT_SENSOR) {
|
| + *out = PermissionType::AMBIENT_LIGHT_SENSOR;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_MAGNETOMETER) {
|
| + *out = PermissionType::MAGNETOMETER;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_ACCELEROMETER) {
|
| + *out = PermissionType::ACCELEROMETER;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_GYROSCOPE) {
|
| + *out = PermissionType::GYROSCOPE;
|
| + } else if (type == CONTENT_SETTINGS_TYPE_ORIENTATION_SENSOR) {
|
| + *out = PermissionType::ORIENTATION_SENSOR;
|
| } else if (type == CONTENT_SETTINGS_TYPE_DURABLE_STORAGE) {
|
| *out = PermissionType::DURABLE_STORAGE;
|
| } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
|
|
|