summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authorperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 19:54:58 +0000
committerperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-04 19:54:58 +0000
commit8a85398c4980d42990c5cd53bc9f9c83ced75f3b (patch)
tree56f4aee9a470144f4aa0ed8353468e9959744ad8 /content/public
parent4daa4ee18de5452b95e70babd8d2a217a0812a5a (diff)
downloadchromium_src-8a85398c4980d42990c5cd53bc9f9c83ced75f3b.zip
chromium_src-8a85398c4980d42990c5cd53bc9f9c83ced75f3b.tar.gz
chromium_src-8a85398c4980d42990c5cd53bc9f9c83ced75f3b.tar.bz2
Refactor MediaStreamManager to never output real device id. It now always output sourceId in the form of a HMAC.
DeviceMessageFilter now don't need to create a source id. This also fix a bug that made the source ids useless unless you have called gum once. Note that the sourceIds are still just using the security origin as salt. Next step is to add a random number that is stored in the profile somehow. This cl also make sure all public APIs are asynchronous by making sure all requests are posted on the UI thread and handled later. Before this change - there were code paths that posted on the UI thread and others that did not that could potentially happen after a request was cancelled. This also make it easier to fail a request based on the input arguments. BUG=269139 Review URL: https://codereview.chromium.org/34393006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/common/media_stream_request.cc2
-rw-r--r--content/public/common/media_stream_request.h4
2 files changed, 0 insertions, 6 deletions
diff --git a/content/public/common/media_stream_request.cc b/content/public/common/media_stream_request.cc
index 738874e..d9bf5ad 100644
--- a/content/public/common/media_stream_request.cc
+++ b/content/public/common/media_stream_request.cc
@@ -62,7 +62,6 @@ MediaStreamRequest::MediaStreamRequest(
int render_process_id,
int render_view_id,
int page_request_id,
- const std::string& tab_capture_device_id,
const GURL& security_origin,
MediaStreamRequestType request_type,
const std::string& requested_audio_device_id,
@@ -72,7 +71,6 @@ MediaStreamRequest::MediaStreamRequest(
: render_process_id(render_process_id),
render_view_id(render_view_id),
page_request_id(page_request_id),
- tab_capture_device_id(tab_capture_device_id),
security_origin(security_origin),
request_type(request_type),
requested_audio_device_id(requested_audio_device_id),
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
index 9e612ad..e5400a0 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -26,9 +26,6 @@ enum MediaStreamType {
MEDIA_DEVICE_VIDEO_CAPTURE,
// Mirroring of a browser tab.
- //
- // TODO(serygeu): Remove these values and use MEDIA_DESKTOP_VIDEO_CAPTURE and
- // MEDIA_DESKTOP_AUDIO_CAPTURE.
MEDIA_TAB_AUDIO_CAPTURE,
MEDIA_TAB_VIDEO_CAPTURE,
@@ -164,7 +161,6 @@ struct CONTENT_EXPORT MediaStreamRequest {
int render_process_id,
int render_view_id,
int page_request_id,
- const std::string& tab_capture_device_id,
const GURL& security_origin,
MediaStreamRequestType request_type,
const std::string& requested_audio_device_id,