talk/session/media/channel.h - Issue 1380603005: Revert of Change WebRTC SslCipher to be exposed as number only.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/session/media/channel.h

Issue 1380603005: Revert of Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

Index: talk/session/media/channel.h

diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h

index dec5c985ae164cef0968c6ab3741f65974ba0422..0a7ce9d1a9e8355bc83ac4433a751ef22deb0354 100644

--- a/talk/session/media/channel.h

+++ b/talk/session/media/channel.h

@@ -284,8 +284,7 @@

// Handled in derived classes

// Get the SRTP ciphers to use for RTP media

- virtual void GetSrtpCryptoSuiteNames(

- std::vector<std::string>* ciphers) const = 0;

+ virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const = 0;

virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor,

const std::vector<ConnectionInfo>& infos) = 0;

@@ -414,7 +413,7 @@

bool GetStats_w(VoiceMediaInfo* stats);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

@@ -511,7 +510,7 @@

bool GetStats_w(VideoMediaInfo* stats);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

@@ -636,7 +635,7 @@

virtual bool WantsPacket(bool rtcp, rtc::Buffer* packet);

virtual void OnMessage(rtc::Message* pmsg);

- virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;

+ virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;

virtual void OnConnectionMonitorUpdate(

ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);

virtual void OnMediaMonitorUpdate(

« no previous file with comments | « talk/app/webrtc/webrtcsession.cc ('k') | talk/session/media/channel.cc » ('j') | no next file with comments »