content/renderer/media/media_stream_impl.h - Issue 10071038: RefCounted types should not have public destructors, content/browser part 2

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_impl.h

Issue 10071038: RefCounted types should not have public destructors, content/browser part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Copyright bump 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 | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/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_MEDIA_STREAM_IMPL_H_	5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_

6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_	6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_

7	7

8 #include <list>	8 #include <list>

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

(...skipping 183 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
194 MediaStreamTrackPtr;	194 MediaStreamTrackPtr;

195 typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap;	195 typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap;

196 MediaStreamTrackPtrMap local_tracks_;	196 MediaStreamTrackPtrMap local_tracks_;

197	197

198 // PeerConnection threads. signaling_thread_ is created from the	198 // PeerConnection threads. signaling_thread_ is created from the

199 // "current" chrome thread.	199 // "current" chrome thread.

200 talk_base::Thread* signaling_thread_;	200 talk_base::Thread* signaling_thread_;

201 talk_base::Thread* worker_thread_;	201 talk_base::Thread* worker_thread_;

202 base::Thread chrome_worker_thread_;	202 base::Thread chrome_worker_thread_;

203	203

204 static int next_request_id_;

205 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap;	204 typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap;

206 MediaRequestMap user_media_requests_;	205 MediaRequestMap user_media_requests_;

207	206

208 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);	207 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);

209 };	208 };

210	209

211 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_	210 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_

OLD	NEW