content/common/media/media_stream_messages.h - Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/media/media_stream_messages.h

Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« content/browser/speech/speech_recognition_manager_impl.cc ('K') | « content/browser/speech/speech_recognition_manager_impl.cc ('k') | content/common/media/media_stream_options.cc » ('j') | content/renderer/media/media_stream_audio_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/media/media_stream_messages.h

diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h

index 0d331709a1d5bbf9419c49226c7cf41d7c39736c..e88aeab66ddf3f9711ef7afb8e8651ef4eb3965e 100644

--- a/content/common/media/media_stream_messages.h

+++ b/content/common/media/media_stream_messages.h

@@ -105,7 +105,7 @@ IPC_MESSAGE_CONTROL2(MediaStreamMsg_GetSourcesACK,

// Request a new media stream.

IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream,

- int /* render view id */,

+ int /* render frame id */,

int /* request id */,

content::StreamOptions /* components */,

GURL /* security origin */,

@@ -113,12 +113,12 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream,

// Request to cancel the request for a new media stream.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream,

- int /* render view id */,

+ int /* render frame id */,

int /* request id */)

// Request to close a device that has been opened by GenerateStream.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice,

- int /* render view id */,

+ int /* render frame id */,

std::string /*device_id*/)

// Request to enumerate devices.

@@ -129,7 +129,7 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources,

// Request to enumerate devices.

// Used by Pepper and WebRTC.

IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices,

- int /* render view id */,

+ int /* render frame id */,

int /* request id */,

content::MediaStreamType /* type */,

GURL /* security origin */,

@@ -137,12 +137,12 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices,

// Request to stop enumerating devices.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices,

- int /* render view id */,

+ int /* render frame id */,

int /* request id */)

// Request to open the device.

IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,

- int /* render view id */,

+ int /* render frame id */,

int /* request id */,

std::string /* device_id */,

content::MediaStreamType /* type */,

@@ -150,5 +150,5 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,

// Request to close a device.

IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice,

- int /* render view id */,

+ int /* render frame id */,

std::string /*label*/)