| Index: chrome/browser/permissions/permission_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
|
| index 031d46958541a6651e6c8ce78fe8ba39fa268f72..55fca62276c68385a1fb1c0e15c541a38ac46832 100644
|
| --- a/chrome/browser/permissions/permission_manager.cc
|
| +++ b/chrome/browser/permissions/permission_manager.cc
|
| @@ -21,6 +21,7 @@
|
| #include "chrome/browser/permissions/permission_request_id.h"
|
| #include "chrome/browser/permissions/permission_uma_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/sensor/sensor_permission_context.h"
|
| #include "chrome/browser/storage/durable_storage_permission_context.h"
|
| #include "chrome/browser/tab_contents/tab_util.h"
|
| #include "chrome/common/features.h"
|
| @@ -107,6 +108,8 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) {
|
| return CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
|
| case PermissionType::BACKGROUND_SYNC:
|
| return CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;
|
| + case PermissionType::SENSORS:
|
| + return CONTENT_SETTINGS_TYPE_SENSORS;
|
| case PermissionType::FLASH:
|
| return CONTENT_SETTINGS_TYPE_PLUGINS;
|
| case PermissionType::NUM:
|
| @@ -258,7 +261,9 @@ PermissionManager::PermissionManager(Profile* profile)
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
|
| permission_contexts_[PermissionType::BACKGROUND_SYNC] =
|
| base::MakeUnique<BackgroundSyncPermissionContext>(profile);
|
| -#if BUILDFLAG(ENABLE_PLUGINS)
|
| + permission_contexts_[PermissionType::SENSORS] =
|
| + base::MakeUnique<SensorPermissionContext>(profile);
|
| +#if defined(ENABLE_PLUGINS)
|
| permission_contexts_[PermissionType::FLASH] =
|
| base::MakeUnique<FlashPermissionContext>(profile);
|
| #endif
|
|
|