content/renderer/media/remote_media_stream_impl.h - Issue 1547073003: Switch to standard integer types in content/renderer/.

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

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « content/renderer/media/pepper_to_video_track_adapter.cc ('k') | content/renderer/media/remote_media_stream_impl.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_REMOTE_MEDIA_STREAM_IMPL_H_	5 #ifndef CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_

6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_	6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_

7	7

8 #include "base/basictypes.h"

9 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

	9 #include "base/macros.h"

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

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

12 #include "base/memory/weak_ptr.h"	12 #include "base/memory/weak_ptr.h"

13 #include "base/single_thread_task_runner.h"	13 #include "base/single_thread_task_runner.h"

14 #include "base/threading/thread_checker.h"	14 #include "base/threading/thread_checker.h"

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

	16 #include "third_party/WebKit/public/platform/WebMediaStream.h"

16 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"	17 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"

17 #include "third_party/WebKit/public/platform/WebMediaStream.h"

18	18

19 namespace content {	19 namespace content {

20	20

21 class RemoteAudioTrackAdapter;	21 class RemoteAudioTrackAdapter;

22 class RemoteVideoTrackAdapter;	22 class RemoteVideoTrackAdapter;

23	23

24 // RemoteMediaStreamImpl serves as a container and glue between remote webrtc	24 // RemoteMediaStreamImpl serves as a container and glue between remote webrtc

25 // MediaStreams and WebKit MediaStreams. For each remote MediaStream received	25 // MediaStreams and WebKit MediaStreams. For each remote MediaStream received

26 // on a PeerConnection a RemoteMediaStreamImpl instance is created and	26 // on a PeerConnection a RemoteMediaStreamImpl instance is created and

27 // owned by RtcPeerConnection.	27 // owned by RtcPeerConnection.

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 blink::WebMediaStream webkit_stream_;	96 blink::WebMediaStream webkit_stream_;

97	97

98 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;	98 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;

99	99

100 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl);	100 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl);

101 };	101 };

102	102

103 } // namespace content	103 } // namespace content

104	104

105 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_	105 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_

OLD	NEW