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

Unified Diff: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

Issue 16778002: MediaStream API: Changing the device enumeration to be async (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed review comments Created 7 years, 6 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: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
diff --git a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
index 8dc3b085b344c386bf5134c53f89795af861d55f..e8016a1c378f5c3e9f58a901241e1daabe0fe108 100644
--- a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
+++ b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
@@ -34,11 +34,13 @@
#include "core/platform/mediastream/MediaStreamDescriptor.h"
#include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
+#include "modules/mediastream/MediaStreamTrackSourcesRequest.h"
jamesr 2013/06/12 17:39:40 this is also unfortunate
#include "public/platform/Platform.h"
#include "public/platform/WebMediaStream.h"
#include "public/platform/WebMediaStreamCenter.h"
#include "public/platform/WebMediaStreamSourcesRequest.h"
#include "public/platform/WebMediaStreamTrack.h"
+#include "public/platform/WebMediaStreamTrackSourcesRequest.h"
#include "wtf/MainThread.h"
#include "wtf/PassOwnPtr.h"
@@ -70,9 +72,9 @@ void MediaStreamCenterChromium::queryMediaStreamSources(PassRefPtr<MediaStreamSo
}
}
-bool MediaStreamCenterChromium::getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>& sourceInfos)
+bool MediaStreamCenterChromium::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequest> request)
{
- return m_private && m_private->getSourceInfos(url, sourceInfos);
+ return m_private && m_private->getMediaStreamTrackSources(request);
}
void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream, MediaStreamComponent* component)

Powered by Google App Engine
This is Rietveld 408576698