Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Side by Side Diff: remoting/host/cast_extension_session.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 REMOTING_HOST_CAST_EXTENSION_SESSION_H_ 5 #ifndef REMOTING_HOST_CAST_EXTENSION_SESSION_H_
6 #define REMOTING_HOST_CAST_EXTENSION_SESSION_H_ 6 #define REMOTING_HOST_CAST_EXTENSION_SESSION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "jingle/glue/thread_wrapper.h" 16 #include "jingle/glue/thread_wrapper.h"
17 #include "remoting/host/host_extension_session.h" 17 #include "remoting/host/host_extension_session.h"
18 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 18 #include "third_party/webrtc/api/peerconnectioninterface.h"
19 #include "third_party/webrtc/base/scoped_ref_ptr.h" 19 #include "third_party/webrtc/base/scoped_ref_ptr.h"
20 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" 20 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
21 21
22 namespace base { 22 namespace base {
23 class SingleThreadTaskRunner; 23 class SingleThreadTaskRunner;
24 class WaitableEvent; 24 class WaitableEvent;
25 } // namespace base 25 } // namespace base
26 26
27 namespace webrtc { 27 namespace webrtc {
28 class MediaStreamInterface; 28 class MediaStreamInterface;
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 // Worker thread that is wrapped to create |worker_thread_wrapper_|. 222 // Worker thread that is wrapped to create |worker_thread_wrapper_|.
223 base::Thread worker_thread_; 223 base::Thread worker_thread_;
224 224
225 DISALLOW_COPY_AND_ASSIGN(CastExtensionSession); 225 DISALLOW_COPY_AND_ASSIGN(CastExtensionSession);
226 }; 226 };
227 227
228 } // namespace remoting 228 } // namespace remoting
229 229
230 #endif // REMOTING_HOST_CAST_EXTENSION_SESSION_H_ 230 #endif // REMOTING_HOST_CAST_EXTENSION_SESSION_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track_unittest.cc ('k') | remoting/host/cast_extension_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698