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

Side by Side Diff: talk/app/webrtc/webrtcsessiondescriptionfactory.h

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase + revert basictypes.h (to be landed separately just in case of a revert due to unexpected us… Created 5 years, 2 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 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 void OnIdentityRequestFailed(int error); 179 void OnIdentityRequestFailed(int error);
180 void SetCertificate( 180 void SetCertificate(
181 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate); 181 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
182 182
183 std::queue<CreateSessionDescriptionRequest> 183 std::queue<CreateSessionDescriptionRequest>
184 create_session_description_requests_; 184 create_session_description_requests_;
185 rtc::Thread* const signaling_thread_; 185 rtc::Thread* const signaling_thread_;
186 MediaStreamSignaling* const mediastream_signaling_; 186 MediaStreamSignaling* const mediastream_signaling_;
187 cricket::TransportDescriptionFactory transport_desc_factory_; 187 cricket::TransportDescriptionFactory transport_desc_factory_;
188 cricket::MediaSessionDescriptionFactory session_desc_factory_; 188 cricket::MediaSessionDescriptionFactory session_desc_factory_;
189 uint64 session_version_; 189 uint64_t session_version_;
190 const rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_; 190 const rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_;
191 const rtc::scoped_refptr<WebRtcIdentityRequestObserver> 191 const rtc::scoped_refptr<WebRtcIdentityRequestObserver>
192 identity_request_observer_; 192 identity_request_observer_;
193 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. 193 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed.
194 WebRtcSession* const session_; 194 WebRtcSession* const session_;
195 const std::string session_id_; 195 const std::string session_id_;
196 const cricket::DataChannelType data_channel_type_; 196 const cricket::DataChannelType data_channel_type_;
197 CertificateRequestState certificate_request_state_; 197 CertificateRequestState certificate_request_state_;
198 198
199 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); 199 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);
200 }; 200 };
201 } // namespace webrtc 201 } // namespace webrtc
202 202
203 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 203 #endif // TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/app/webrtc/webrtcsessiondescriptionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698