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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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
« no previous file with comments | « webrtc/build/common.gypi ('k') | webrtc/examples/peerconnection/client/conductor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 11 #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
12 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 12 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
13 #pragma once 13 #pragma once
14 14
15 #include <deque> 15 #include <deque>
16 #include <map> 16 #include <map>
17 #include <set> 17 #include <set>
18 #include <string> 18 #include <string>
19 19
20 #include "talk/app/webrtc/mediastreaminterface.h" 20 #include "webrtc/api/mediastreaminterface.h"
21 #include "talk/app/webrtc/peerconnectioninterface.h" 21 #include "webrtc/api/peerconnectioninterface.h"
22 #include "webrtc/examples/peerconnection/client/main_wnd.h" 22 #include "webrtc/examples/peerconnection/client/main_wnd.h"
23 #include "webrtc/examples/peerconnection/client/peer_connection_client.h" 23 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
24 #include "webrtc/base/scoped_ptr.h" 24 #include "webrtc/base/scoped_ptr.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 class VideoCaptureModule; 27 class VideoCaptureModule;
28 } // namespace webrtc 28 } // namespace webrtc
29 29
30 namespace cricket { 30 namespace cricket {
31 class VideoRenderer; 31 class VideoRenderer;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 peer_connection_factory_; 125 peer_connection_factory_;
126 PeerConnectionClient* client_; 126 PeerConnectionClient* client_;
127 MainWindow* main_wnd_; 127 MainWindow* main_wnd_;
128 std::deque<std::string*> pending_messages_; 128 std::deque<std::string*> pending_messages_;
129 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 129 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
130 active_streams_; 130 active_streams_;
131 std::string server_; 131 std::string server_;
132 }; 132 };
133 133
134 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 134 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW
« no previous file with comments | « webrtc/build/common.gypi ('k') | webrtc/examples/peerconnection/client/conductor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698