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

Side by Side Diff: webrtc/examples/peerconnection/client/linux/main.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 <gtk/gtk.h> 11 #include <gtk/gtk.h>
12 12
13 #include "webrtc/examples/peerconnection/client/conductor.h" 13 #include "webrtc/examples/peerconnection/client/conductor.h"
14 #include "webrtc/examples/peerconnection/client/flagdefs.h" 14 #include "webrtc/examples/peerconnection/client/flagdefs.h"
15 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h" 15 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h"
16 #include "webrtc/examples/peerconnection/client/peer_connection_client.h" 16 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
17 17
18 #include "webrtc/base/ssladapter.h" 18 #include "webrtc/rtc_base/ssladapter.h"
19 #include "webrtc/base/thread.h" 19 #include "webrtc/rtc_base/thread.h"
20 20
21 class CustomSocketServer : public rtc::PhysicalSocketServer { 21 class CustomSocketServer : public rtc::PhysicalSocketServer {
22 public: 22 public:
23 explicit CustomSocketServer(GtkMainWnd* wnd) 23 explicit CustomSocketServer(GtkMainWnd* wnd)
24 : wnd_(wnd), conductor_(NULL), client_(NULL) {} 24 : wnd_(wnd), conductor_(NULL), client_(NULL) {}
25 virtual ~CustomSocketServer() {} 25 virtual ~CustomSocketServer() {}
26 26
27 void SetMessageQueue(rtc::MessageQueue* queue) override { 27 void SetMessageQueue(rtc::MessageQueue* queue) override {
28 message_queue_ = queue; 28 message_queue_ = queue;
29 } 29 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // TODO(henrike): Run the Gtk main loop to tear down the connection. 104 // TODO(henrike): Run the Gtk main loop to tear down the connection.
105 /* 105 /*
106 while (gtk_events_pending()) { 106 while (gtk_events_pending()) {
107 gtk_main_iteration(); 107 gtk_main_iteration();
108 } 108 }
109 */ 109 */
110 rtc::CleanupSSL(); 110 rtc::CleanupSSL();
111 return 0; 111 return 0;
112 } 112 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/flagdefs.h ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698