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

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

Issue 10786029: Delete MediaStreamManager in the same way as AudioManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the pyauto test Created 8 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
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index c3a33506affb92e87aa25bf0c20d7cbf5a92e1ed..456c217d3afd1e35922cfdb47f6f8a00449cbaaa 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -43,15 +43,18 @@ class ResponseCallbackHelper
void PostResponse(const std::string& label,
const content::MediaStreamDevices& devices) {
+ if (!settings_)
tommi (sloooow) - chröme 2012/07/18 08:15:23 it's better to do this check only on the IO thread
no longer working on chromium 2012/07/18 09:39:28 But can BrowserThread::PostTask(BrowserThread::IO,
+ return;
+
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&media_stream::MediaStreamDeviceSettings::PostResponse,
settings_, label, devices));
return;
- } else if (settings_) {
- settings_->PostResponse(label, devices);
}
+
+ settings_->PostResponse(label, devices);
}
private:

Powered by Google App Engine
This is Rietveld 408576698