content/renderer/pepper/pepper_device_enumeration_event_handler.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/pepper/pepper_device_enumeration_event_handler.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/renderer/media/video_capture_message_filter_unittest.cc ('K') | « content/renderer/media/video_capture_message_filter_unittest.cc ('k') | content/renderer/pepper/pepper_device_enumeration_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_device_enumeration_event_handler.h

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

--- content/renderer/pepper/pepper_device_enumeration_event_handler.h (revision 164646)

+++ content/renderer/pepper/pepper_device_enumeration_event_handler.h (working copy)

@@ -31,30 +31,28 @@

virtual void OnStreamGenerated(

int request_id,

const std::string& label,

- const media_stream::StreamDeviceInfoArray& audio_device_array,

- const media_stream::StreamDeviceInfoArray& video_device_array) OVERRIDE;

+ const StreamDeviceInfoArray& audio_device_array,

+ const StreamDeviceInfoArray& video_device_array) OVERRIDE;

virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;

virtual void OnDevicesEnumerated(

int request_id,

- const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;

+ const StreamDeviceInfoArray& device_array) OVERRIDE;

virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;

virtual void OnDeviceOpened(

int request_id,

const std::string& label,

- const media_stream::StreamDeviceInfo& device_info) OVERRIDE;

+ const StreamDeviceInfo& device_info) OVERRIDE;

virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;

// Stream type conversion.

- static media_stream::MediaStreamType FromPepperDeviceType(

- PP_DeviceType_Dev type);

- static PP_DeviceType_Dev FromMediaStreamType(

- media_stream::MediaStreamType type);

+ static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type);

+ static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type);

private:

void NotifyDevicesEnumerated(

int request_id,

bool succeeded,

- const media_stream::StreamDeviceInfoArray& device_array);

+ const StreamDeviceInfoArray& device_array);

void NotifyDeviceOpened(int request_id,

bool succeeded,