content/renderer/media/webrtc/webrtc_media_stream_track_adapter_map.h - Issue 2952593002: Fix ifdef in webrtc_media_stream_track_adapter_map.h

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/webrtc/webrtc_media_stream_track_adapter_map.h

Issue 2952593002: Fix ifdef in webrtc_media_stream_track_adapter_map.h (Closed)

Patch Set: Created 3 years, 6 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 | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2017 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2017 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_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_COLLECTION_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_ADAPTER_MAP_H_

6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_COLLECTION_H_	6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_ADAPTER_MAP_H_

7	7

8 #include <map>	8 #include <map>

9 #include <string>	9 #include <string>

10	10

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

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

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

14 #include "content/renderer/media/webrtc/webrtc_media_stream_track_adapter.h"	14 #include "content/renderer/media/webrtc/webrtc_media_stream_track_adapter.h"

15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"	15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

16 #include "third_party/webrtc/api/mediastreaminterface.h"	16 #include "third_party/webrtc/api/mediastreaminterface.h"

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 PeerConnectionDependencyFactory* const factory_;	135 PeerConnectionDependencyFactory* const factory_;

136 scoped_refptr<base::SingleThreadTaskRunner> main_thread_;	136 scoped_refptr<base::SingleThreadTaskRunner> main_thread_;

137	137

138 mutable base::Lock lock_;	138 mutable base::Lock lock_;

139 std::map<std::string, AdapterEntry> local_track_adapters_;	139 std::map<std::string, AdapterEntry> local_track_adapters_;

140 std::map<std::string, AdapterEntry> remote_track_adapters_;	140 std::map<std::string, AdapterEntry> remote_track_adapters_;

141 };	141 };

142	142

143 } // namespace content	143 } // namespace content

144	144

145 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_COLLECTION_H_	145 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_TRACK_ADAPTER_MAP_H _

OLD	NEW