Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: chrome/browser/media/media_stream_devices_controller.cc

Issue 180633008: Add different error codes for getUserMedia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {

Powered by Google App Engine
This is Rietveld 408576698