| Index: chrome/browser/media/media_stream_devices_controller.h
|
| diff --git a/chrome/browser/media/media_stream_devices_controller.h b/chrome/browser/media/media_stream_devices_controller.h
|
| index 2468df767c4cade1de9b7e5cb36893dcddc1f58c..bfcf8557b22d830ae9b50836fd20391cd97a1cd4 100644
|
| --- a/chrome/browser/media/media_stream_devices_controller.h
|
| +++ b/chrome/browser/media/media_stream_devices_controller.h
|
| @@ -28,6 +28,10 @@ class MediaStreamDevicesController {
|
|
|
| virtual ~MediaStreamDevicesController();
|
|
|
| + // TODO(tommi): Clean up all the policy code and integrate with
|
| + // HostContentSettingsMap instead. This will make creating the UI simpler
|
| + // and the code cleaner. crbug.com/244389.
|
| +
|
| // Registers the prefs backing the audio and video policies.
|
| static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
|
|
|
| @@ -52,7 +56,8 @@ class MediaStreamDevicesController {
|
|
|
| // Called by GetAudioDevicePolicy and GetVideoDevicePolicy to check
|
| // the currently set capture device policy.
|
| - DevicePolicy GetDevicePolicy(const char* policy_name) const;
|
| + DevicePolicy GetDevicePolicy(const char* policy_name,
|
| + const char* whitelist_policy_name) const;
|
|
|
| // Returns true if the origin of the request has been granted the media
|
| // access before, otherwise returns false.
|
|
|