| Index: chrome/browser/media/media_stream_devices_controller.cc
|
| diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
|
| index 3b4e46149ddb10859cbaac0a30e028bbc49f775a..bd96d2e58794b8937e0c57c7752985b19d4a00e7 100644
|
| --- a/chrome/browser/media/media_stream_devices_controller.cc
|
| +++ b/chrome/browser/media/media_stream_devices_controller.cc
|
| @@ -131,6 +131,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
|
| MediaStreamDevicesController::~MediaStreamDevicesController() {
|
| if (!callback_.is_null()) {
|
| callback_.Run(content::MediaStreamDevices(),
|
| + content::MEDIA_DEVICE_INVALID_STATE,
|
| scoped_ptr<content::MediaStreamUI>());
|
| }
|
| }
|
| @@ -335,7 +336,7 @@ void MediaStreamDevicesController::Accept(bool update_content_setting) {
|
| }
|
| content::MediaResponseCallback cb = callback_;
|
| callback_.Reset();
|
| - cb.Run(devices, ui.Pass());
|
| + cb.Run(devices, content::MEDIA_DEVICE_OK, ui.Pass());
|
| }
|
|
|
| void MediaStreamDevicesController::Deny(bool update_content_setting) {
|
| @@ -346,7 +347,11 @@ void MediaStreamDevicesController::Deny(bool update_content_setting) {
|
|
|
| content::MediaResponseCallback cb = callback_;
|
| callback_.Reset();
|
| - cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
|
| + cb.Run(content::MediaStreamDevices(),
|
| + update_content_setting ?
|
| + content::MEDIA_DEVICE_PERMISSION_DENIED :
|
| + content::MEDIA_DEVICE_PERMISSION_DISMISSED,
|
| + scoped_ptr<content::MediaStreamUI>());
|
| }
|
|
|
| base::string16 MediaStreamDevicesController::GetMessageText() const {
|
|
|