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

Unified Diff: content/browser/renderer_host/media/media_stream_device_settings.cc

Issue 7284037: Adding MediaStreamManager. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Added DeviceRequest dtor, needed for clang. Created 9 years, 5 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: content/browser/renderer_host/media/media_stream_device_settings.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_device_settings.cc (revision 91672)
+++ content/browser/renderer_host/media/media_stream_device_settings.cc (working copy)
@@ -44,7 +44,6 @@
}
MediaStreamDeviceSettings::~MediaStreamDeviceSettings() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
STLDeleteValues(&requests_);
}
@@ -55,7 +54,7 @@
if (requests_.find(label) != requests_.end()) {
// Request with this id already exists.
- requester_->Error(label);
+ requester_->SettingsError(label);
return;
}
@@ -81,7 +80,7 @@
SettingsRequests::iterator request_it = requests_.find(label);
if (request_it == requests_.end()) {
// Request with this id doesn't exist.
- requester_->Error(label);
+ requester_->SettingsError(label);
return;
}

Powered by Google App Engine
This is Rietveld 408576698