summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorcrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-25 21:56:28 +0000
committercrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-25 21:56:28 +0000
commitb12a2fece633f85b8cd2079077c2e181daff30c2 (patch)
tree29da30bc73410f755e8299dbbb07f636fb2c9462 /content
parent3ba63c1e6a3f0e6212de1f7353c035732c4e3ae9 (diff)
downloadchromium_src-b12a2fece633f85b8cd2079077c2e181daff30c2.zip
chromium_src-b12a2fece633f85b8cd2079077c2e181daff30c2.tar.gz
chromium_src-b12a2fece633f85b8cd2079077c2e181daff30c2.tar.bz2
Make sure to call WebMediaStreamSource::setDeviceId()
This is a followup to: https://codereview.chromium.org/12218106/ now that WebMediaStreamSource::setDeviceId() is implemented in WebKit BUG=none TEST=manual test Review URL: https://codereview.chromium.org/12335072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/media/media_stream_impl.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 43a1fbe..88206a7 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -94,10 +94,7 @@ void CreateWebKitSourceVector(
UTF8ToUTF16(devices[i].device.name));
webkit_sources[i].setExtraData(
new content::MediaStreamSourceExtraData(devices[i]));
-#if 0
- // TODO(crogers): enable once WebKit supports setDeviceId().
webkit_sources[i].setDeviceId(UTF8ToUTF16(devices[i].device.id.c_str()));
-#endif
}
}