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

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

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
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 <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "talk/app/webrtc/test/fakeconstraints.h" 16 #include "webrtc/api/videosourceinterface.h"
17 #include "talk/app/webrtc/videosourceinterface.h" 17 #include "webrtc/api/test/fakeconstraints.h"
18 #include "webrtc/base/common.h" 18 #include "webrtc/base/common.h"
19 #include "webrtc/base/json.h" 19 #include "webrtc/base/json.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/examples/peerconnection/client/defaults.h" 21 #include "webrtc/examples/peerconnection/client/defaults.h"
22 #include "webrtc/media/devices/devicemanager.h" 22 #include "webrtc/media/devices/devicemanager.h"
23 23
24 // Names used for a IceCandidate JSON object. 24 // Names used for a IceCandidate JSON object.
25 const char kCandidateSdpMidName[] = "sdpMid"; 25 const char kCandidateSdpMidName[] = "sdpMid";
26 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex"; 26 const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex";
27 const char kCandidateSdpName[] = "candidate"; 27 const char kCandidateSdpName[] = "candidate";
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 531 }
532 532
533 void Conductor::OnFailure(const std::string& error) { 533 void Conductor::OnFailure(const std::string& error) {
534 LOG(LERROR) << error; 534 LOG(LERROR) << error;
535 } 535 }
536 536
537 void Conductor::SendMessage(const std::string& json_object) { 537 void Conductor::SendMessage(const std::string& json_object) {
538 std::string* msg = new std::string(json_object); 538 std::string* msg = new std::string(json_object);
539 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); 539 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg);
540 } 540 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/conductor.h ('k') | webrtc/examples/peerconnection/client/main_wnd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698