| Index: chrome/browser/permissions/permission_util.cc
|
| diff --git a/chrome/browser/permissions/permission_util.cc b/chrome/browser/permissions/permission_util.cc
|
| index 8e3e3901defd9e6d0e82e8fbbee62e3ab38368b7..86ffa289673efea6b89acc7cf6dd57ec4a8f1c1a 100644
|
| --- a/chrome/browser/permissions/permission_util.cc
|
| +++ b/chrome/browser/permissions/permission_util.cc
|
| @@ -43,6 +43,8 @@ std::string PermissionUtil::GetPermissionString(
|
| return "BackgroundSync";
|
| case CONTENT_SETTINGS_TYPE_PLUGINS:
|
| return "Flash";
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| + return "Sensors";
|
| default:
|
| break;
|
| }
|
| @@ -73,6 +75,8 @@ std::string PermissionUtil::ConvertContentSettingsTypeToSafeBrowsingName(
|
| return "BACKGROUND_SYNC";
|
| case CONTENT_SETTINGS_TYPE_PLUGINS:
|
| return "FLASH";
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| + return "SENSORS";
|
| default:
|
| break;
|
| }
|
| @@ -135,6 +139,8 @@ bool PermissionUtil::GetPermissionType(ContentSettingsType type,
|
| } else if (type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
|
| *out = PermissionType::PROTECTED_MEDIA_IDENTIFIER;
|
| #endif
|
| + } else if (type == CONTENT_SETTINGS_TYPE_SENSORS) {
|
| + *out = PermissionType::SENSORS;
|
| } else {
|
| return false;
|
| }
|
| @@ -162,6 +168,7 @@ bool PermissionUtil::IsPermission(ContentSettingsType type) {
|
| #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
| case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
|
| #endif
|
| + case CONTENT_SETTINGS_TYPE_SENSORS:
|
| return true;
|
| default:
|
| return false;
|
|
|