| 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..4ca9efa26989247d87246f4eea707f50a5bca8d8 100644
|
| --- a/chrome/browser/media/media_stream_devices_controller.cc
|
| +++ b/chrome/browser/media/media_stream_devices_controller.cc
|
| @@ -130,7 +130,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
|
|
|
| MediaStreamDevicesController::~MediaStreamDevicesController() {
|
| if (!callback_.is_null()) {
|
| - callback_.Run(content::MediaStreamDevices(),
|
| + callback_.Run(content::MediaStreamDevices(), content::INVALID_STATE,
|
| scoped_ptr<content::MediaStreamUI>());
|
| }
|
| }
|
| @@ -335,7 +335,7 @@ void MediaStreamDevicesController::Accept(bool update_content_setting) {
|
| }
|
| content::MediaResponseCallback cb = callback_;
|
| callback_.Reset();
|
| - cb.Run(devices, ui.Pass());
|
| + cb.Run(devices, content::OK, ui.Pass());
|
| }
|
|
|
| void MediaStreamDevicesController::Deny(bool update_content_setting) {
|
| @@ -346,7 +346,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::PERMISSION_DENIED :
|
| + content::PERMISSION_DISMISSED,
|
| + scoped_ptr<content::MediaStreamUI>());
|
| }
|
|
|
| base::string16 MediaStreamDevicesController::GetMessageText() const {
|
|
|