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

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

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 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
« no previous file with comments | « talk/app/webrtc/videosource.cc ('k') | talk/app/webrtc/webrtcsessiondescriptionfactory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // (via PeerConnectionObserver) 100 // (via PeerConnectionObserver)
101 virtual void OnIceComplete() {} 101 virtual void OnIceComplete() {}
102 102
103 // Called whenever the state changes between receiving and not receiving. 103 // Called whenever the state changes between receiving and not receiving.
104 virtual void OnIceConnectionReceivingChange(bool receiving) {} 104 virtual void OnIceConnectionReceivingChange(bool receiving) {}
105 105
106 protected: 106 protected:
107 ~IceObserver() {} 107 ~IceObserver() {}
108 108
109 private: 109 private:
110 DISALLOW_COPY_AND_ASSIGN(IceObserver); 110 RTC_DISALLOW_COPY_AND_ASSIGN(IceObserver);
111 }; 111 };
112 112
113 class WebRtcSession : public cricket::BaseSession, 113 class WebRtcSession : public cricket::BaseSession,
114 public AudioProviderInterface, 114 public AudioProviderInterface,
115 public DataChannelFactory, 115 public DataChannelFactory,
116 public VideoProviderInterface, 116 public VideoProviderInterface,
117 public DtmfProviderInterface, 117 public DtmfProviderInterface,
118 public DataChannelProviderInterface { 118 public DataChannelProviderInterface {
119 public: 119 public:
120 WebRtcSession(cricket::ChannelManager* channel_manager, 120 WebRtcSession(cricket::ChannelManager* channel_manager,
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 cricket::AudioOptions audio_options_; 407 cricket::AudioOptions audio_options_;
408 cricket::VideoOptions video_options_; 408 cricket::VideoOptions video_options_;
409 MetricsObserverInterface* metrics_observer_; 409 MetricsObserverInterface* metrics_observer_;
410 410
411 // Declares the bundle policy for the WebRTCSession. 411 // Declares the bundle policy for the WebRTCSession.
412 PeerConnectionInterface::BundlePolicy bundle_policy_; 412 PeerConnectionInterface::BundlePolicy bundle_policy_;
413 413
414 // Declares the RTCP mux policy for the WebRTCSession. 414 // Declares the RTCP mux policy for the WebRTCSession.
415 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 415 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
416 416
417 DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 417 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
418 }; 418 };
419 } // namespace webrtc 419 } // namespace webrtc
420 420
421 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_ 421 #endif // TALK_APP_WEBRTC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/videosource.cc ('k') | talk/app/webrtc/webrtcsessiondescriptionfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698