content/renderer/media/media_stream_dependency_factory.h - Issue 10382003: Changes needed to roll libjingle r141

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/media_stream_dependency_factory.h

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 7 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 | « DEPS ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

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_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

7	7

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

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

11 #include "base/memory/ref_counted.h"	11 #include "base/memory/ref_counted.h"

12 #include "content/common/content_export.h"	12 #include "content/common/content_export.h"

13 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"	13 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "

14 #include "webkit/glue/p2p_transport.h"	14 #include "webkit/glue/p2p_transport.h"

15	15

16 namespace content {	16 namespace content {

17 class IpcNetworkManager;	17 class IpcNetworkManager;

18 class IpcPacketSocketFactory;	18 class IpcPacketSocketFactory;

19 class P2PSocketDispatcher;	19 class P2PSocketDispatcher;

20 }	20 }

21	21

22 namespace cricket {	22 namespace cricket {

23 class PortAllocator;	23 class PortAllocator;

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 const std::string& sdp);	84 const std::string& sdp);

85	85

86 private:	86 private:

87 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;	87 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;

88 scoped_refptr<VideoCaptureImplManager> vc_manager_;	88 scoped_refptr<VideoCaptureImplManager> vc_manager_;

89	89

90 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);	90 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);

91 };	91 };

92	92

93 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_	93 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_

OLD	NEW