content/renderer/media/media_stream_dispatcher.h - Issue 11339014: Move content\browser\renderer_host\media to content namespace.

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/renderer/media/media_stream_dispatcher.h

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 2 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/common/media/video_capture.h ('K') | « content/renderer/media/media_stream_dependency_factory_unittest.cc ('k') | content/renderer/media/media_stream_dispatcher.cc » ('j') | content/renderer/media/video_capture_message_filter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_dispatcher.h

===================================================================

--- content/renderer/media/media_stream_dispatcher.h (revision 164646)

+++ content/renderer/media/media_stream_dispatcher.h (working copy)

@@ -44,7 +44,7 @@

virtual void GenerateStream(

int request_id,

const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,

- const media_stream::StreamOptions& components,

+ const StreamOptions& components,

const GURL& security_origin);

// Cancel the request for a new media stream to be created.

@@ -57,7 +57,7 @@

void EnumerateDevices(

int request_id,

const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,

- media_stream::MediaStreamType type,

+ MediaStreamType type,

const GURL& security_origin);

// Request to stop enumerating devices.

@@ -70,7 +70,7 @@

int request_id,

const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,

const std::string& device_id,

- media_stream::MediaStreamType type,

+ MediaStreamType type,

const GURL& security_origin);

// Close a started device. |label| is provided in OnDeviceOpened.

@@ -127,18 +127,18 @@

void OnStreamGenerated(

int request_id,

const std::string& label,

- const media_stream::StreamDeviceInfoArray& audio_array,

- const media_stream::StreamDeviceInfoArray& video_array);

+ const StreamDeviceInfoArray& audio_array,

+ const StreamDeviceInfoArray& video_array);

void OnStreamGenerationFailed(int request_id);

void OnDevicesEnumerated(

int request_id,

const std::string& label,

- const media_stream::StreamDeviceInfoArray& device_array);

+ const StreamDeviceInfoArray& device_array);

void OnDevicesEnumerationFailed(int request_id);

void OnDeviceOpened(

int request_id,

const std::string& label,

- const media_stream::StreamDeviceInfo& device_info);

+ const StreamDeviceInfo& device_info);

void OnDeviceOpenFailed(int request_id);

void RemoveEnumerationRequest(