content/renderer/media/mock_media_stream_dependency_factory.h - Issue 10833061: Rolling libjingle revison r163.

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: content/renderer/media/mock_media_stream_dependency_factory.h

Issue 10833061: Rolling libjingle revison r163. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 4 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

« content/renderer/media/media_stream_dependency_factory.h ('K') | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/mock_media_stream_dependency_factory.cc » ('j') | content/renderer/media/peer_connection_handler_jsep.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 CreateLocalVideoTrack(	94 CreateLocalVideoTrack(

95 const std::string& label,	95 const std::string& label,

96 int video_session_id) OVERRIDE;	96 int video_session_id) OVERRIDE;

97 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>	97 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>

98 CreateLocalAudioTrack(	98 CreateLocalAudioTrack(

99 const std::string& label,	99 const std::string& label,

100 webrtc::AudioDeviceModule* audio_device) OVERRIDE;	100 webrtc::AudioDeviceModule* audio_device) OVERRIDE;

101 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(	101 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(

102 const std::string& sdp) OVERRIDE;	102 const std::string& sdp) OVERRIDE;

103 virtual webrtc::IceCandidateInterface* CreateIceCandidate(	103 virtual webrtc::IceCandidateInterface* CreateIceCandidate(

104 const std::string& label,	104 const std::string& media_id,

	105 int m_line_index,
	Ronghua Wu (Left Chromium) 2012/07/30 18:09:10 let's change this to sdp_mid and sdp_mline_index t let's change this to sdp_mid and sdp_mline_index to align with the spec. Mallinath (Gone from Chromium) 2012/07/30 18:42:08 Done. Show quoted text On 2012/07/30 18:09:10, Ronghua Wu wrote: > let's change this to sdp_mid and sdp_mline_index to align with the spec. Done.
105 const std::string& sdp) OVERRIDE;	106 const std::string& sdp) OVERRIDE;

106	107

107 private:	108 private:

108 bool mock_pc_factory_created_;	109 bool mock_pc_factory_created_;

109	110

110 DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDependencyFactory);	111 DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDependencyFactory);

111 };	112 };

112	113

113 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	114 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

OLD	NEW