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

Side by Side Diff: remoting/protocol/webrtc_video_capturer_adapter.h

Issue 1669023004: Roll WebRTC 11486:11495, Libjingle 11485:11495 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update includes in content and remoting 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/threading/thread_checker.h" 16 #include "base/threading/thread_checker.h"
17 #include "base/timer/timer.h" 17 #include "base/timer/timer.h"
18 #include "third_party/libjingle/source/talk/media/base/videocapturer.h" 18 #include "third_party/webrtc/media/base/videocapturer.h"
19 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" 19 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
20 20
21 namespace base { 21 namespace base {
22 class SingleThreadTaskRunner; 22 class SingleThreadTaskRunner;
23 } // namespace base 23 } // namespace base
24 24
25 namespace cricket { 25 namespace cricket {
26 class VideoFrame; 26 class VideoFrame;
27 } // namespace cricket 27 } // namespace cricket
28 28
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_; 90 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter); 92 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter);
93 }; 93 };
94 94
95 } // namespace protocol 95 } // namespace protocol
96 } // namespace remoting 96 } // namespace remoting
97 97
98 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 98 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
99 99
OLDNEW
« no previous file with comments | « remoting/protocol/chromium_socket_factory.cc ('k') | remoting/protocol/webrtc_video_capturer_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698