Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h - Issue 13844006: MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h

Issue 13844006: MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebased Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/WebCore/platform/mediastream/MediaStreamDescriptor.h ('k') | Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 // MediaStreamCenter	60 // MediaStreamCenter

61 virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClien t>) OVERRIDE;	61 virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClien t>) OVERRIDE;

62 virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor, MediaStre amComponent) OVERRIDE;	62 virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor, MediaStre amComponent) OVERRIDE;

63 virtual bool didAddMediaStreamTrack(MediaStreamDescriptor, MediaStreamCompo nent) OVERRIDE;	63 virtual bool didAddMediaStreamTrack(MediaStreamDescriptor, MediaStreamCompo nent) OVERRIDE;

64 virtual bool didRemoveMediaStreamTrack(MediaStreamDescriptor, MediaStreamCo mponent) OVERRIDE;	64 virtual bool didRemoveMediaStreamTrack(MediaStreamDescriptor, MediaStreamCo mponent) OVERRIDE;

65 virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;	65 virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;

66 virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;	66 virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;

67	67

68 // WebKit::WebMediaStreamCenterClient	68 // WebKit::WebMediaStreamCenterClient

69 virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;	69 virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;

70 virtual void addMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit ::WebMediaStreamTrack&) OVERRIDE;

71 virtual void removeMediaStreamTrack(const WebKit::WebMediaStream&, const Web Kit::WebMediaStreamTrack&) OVERRIDE;

72	70

73 private:	71 private:

74 OwnPtr<WebKit::WebMediaStreamCenter> m_private;	72 OwnPtr<WebKit::WebMediaStreamCenter> m_private;

75 };	73 };

76	74

77 } // namespace WebCore	75 } // namespace WebCore

78	76

79 #endif // ENABLE(MEDIA_STREAM)	77 #endif // ENABLE(MEDIA_STREAM)

80	78

81 #endif // MediaStreamCenterChromium_h	79 #endif // MediaStreamCenterChromium_h

OLD	NEW