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

Side by Side Diff: content/renderer/media/peer_connection_handler.h

Issue 9174012: Roll libjingle to r108. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 8 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop_proxy.h" 14 #include "base/message_loop_proxy.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" 16 #include "third_party/libjingle/source/talk/app/webrtcv1/peerconnection.h"
17 #include "third_party/libjingle/source/talk/base/socketaddress.h" 17 #include "third_party/libjingle/source/talk/base/socketaddress.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h" 18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h"
19 19
20 namespace base { 20 namespace base {
21 class Thread; 21 class Thread;
22 class WaitableEvent; 22 class WaitableEvent;
23 } 23 }
24 24
25 namespace content { 25 namespace content {
26 class IpcNetworkManager; 26 class IpcNetworkManager;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 INITIATING, 151 INITIATING,
152 RECEIVING, 152 RECEIVING,
153 SENDING_AND_RECEIVING 153 SENDING_AND_RECEIVING
154 }; 154 };
155 CallState call_state_; 155 CallState call_state_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandler); 157 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandler);
158 }; 158 };
159 159
160 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_ 160 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/mock_peer_connection_impl.h ('k') | content/renderer/media/peer_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698