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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 /* 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 #include "webrtc/examples/peerconnection/client/conductor.h" 11 #include "webrtc/examples/peerconnection/client/conductor.h"
12 12
13 #include <memory> 13 #include <memory>
14 #include <utility> 14 #include <utility>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/test/fakeconstraints.h" 17 #include "webrtc/api/test/fakeconstraints.h"
18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/json.h"
20 #include "webrtc/base/logging.h"
21 #include "webrtc/examples/peerconnection/client/defaults.h" 18 #include "webrtc/examples/peerconnection/client/defaults.h"
22 #include "webrtc/media/engine/webrtcvideocapturerfactory.h" 19 #include "webrtc/media/engine/webrtcvideocapturerfactory.h"
23 #include "webrtc/modules/video_capture/video_capture_factory.h" 20 #include "webrtc/modules/video_capture/video_capture_factory.h"
21 #include "webrtc/rtc_base/checks.h"
22 #include "webrtc/rtc_base/json.h"
23 #include "webrtc/rtc_base/logging.h"
24 24
25 // Names used for a IceCandidate JSON object. 25 // Names used for a IceCandidate JSON object.
26 const char kCandidateSdpMidName[] = "sdpMid"; 26 const char kCandidateSdpMidName[] = "sdpMid";
27 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex"; 27 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex";
28 const char kCandidateSdpName[] = "candidate"; 28 const char kCandidateSdpName[] = "candidate";
29 29
30 // Names used for a SessionDescription JSON object. 30 // Names used for a SessionDescription JSON object.
31 const char kSessionDescriptionTypeName[] = "type"; 31 const char kSessionDescriptionTypeName[] = "type";
32 const char kSessionDescriptionSdpName[] = "sdp"; 32 const char kSessionDescriptionSdpName[] = "sdp";
33 33
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 } 537 }
538 538
539 void Conductor::OnFailure(const std::string& error) { 539 void Conductor::OnFailure(const std::string& error) {
540 LOG(LERROR) << error; 540 LOG(LERROR) << error;
541 } 541 }
542 542
543 void Conductor::SendMessage(const std::string& json_object) { 543 void Conductor::SendMessage(const std::string& json_object) {
544 std::string* msg = new std::string(json_object); 544 std::string* msg = new std::string(json_object);
545 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); 545 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg);
546 } 546 }
OLDNEW
« no previous file with comments | « webrtc/common_video/video_render_frames.cc ('k') | webrtc/examples/peerconnection/client/defaults.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698