chrome/browser/media/media_capture_devices_dispatcher.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: chrome/browser/media/media_capture_devices_dispatcher.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: Improved/Stabilized tab capture API impl, plus RFID fixes in desktop capture and speech recog. 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

« chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc ('K') | « chrome/browser/media/desktop_streams_registry.cc ('k') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_capture_devices_dispatcher.h

diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h

index 0c16f3b038895f05a5c527704ec955325ec0e676..6c716616c3f4c58c4791309a44443998ef683718 100644

--- a/chrome/browser/media/media_capture_devices_dispatcher.h

+++ b/chrome/browser/media/media_capture_devices_dispatcher.h

@@ -51,8 +51,8 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,

// Handle an information update related to a media stream request.

virtual void OnRequestUpdate(

int render_process_id,

- int render_view_id,

- const content::MediaStreamDevice& device,

+ int render_frame_id,

+ content::MediaStreamType stream_type,

const content::MediaRequestState state) {}

// Handle an information update that a new stream is being created.

@@ -116,10 +116,10 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,

virtual void OnVideoCaptureDevicesChanged() OVERRIDE;

virtual void OnMediaRequestStateChanged(

int render_process_id,

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const GURL& security_origin,

- const content::MediaStreamDevice& device,

+ content::MediaStreamType stream_type,

content::MediaRequestState state) OVERRIDE;

virtual void OnCreatingAudioStream(int render_process_id,

int render_frame_id) OVERRIDE;

@@ -203,10 +203,10 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,

void NotifyVideoDevicesChangedOnUIThread();

void UpdateMediaRequestStateOnUIThread(

int render_process_id,

- int render_view_id,

+ int render_frame_id,

int page_request_id,

const GURL& security_origin,

- const content::MediaStreamDevice& device,

+ content::MediaStreamType stream_type,

content::MediaRequestState state);

void OnCreatingAudioStreamOnUIThread(int render_process_id,

int render_frame_id);

@@ -236,7 +236,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,

// MEDIA_REQUEST_STATE_CLOSING is encountered.

struct DesktopCaptureSession {

int render_process_id;

- int render_view_id;

+ int render_frame_id;

int page_request_id;

};

typedef std::list<DesktopCaptureSession> DesktopCaptureSessions;