Chromium Code Reviews| Index: remoting/protocol/session_config.cc |
| diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc |
| index 1f05a83182bf91b7ce86337307b5191a9ff28c4a..3d735f1d6693fac30bcc05928c28c8725f94a8a7 100644 |
| --- a/remoting/protocol/session_config.cc |
| +++ b/remoting/protocol/session_config.cc |
| @@ -11,6 +11,9 @@ namespace protocol { |
| const int kDefaultStreamVersion = 2; |
| +// The control channel version that supports the "capabilities" message. |
| +const int kCapabilitiesControlStreamVersion = 3; |
|
Sergey Ulanov
2013/04/18 00:34:53
I think it's better to have kControlStreamVersion=
alexeypa (please no reviews)
2013/04/18 18:56:36
Done.
|
| + |
| ChannelConfig ChannelConfig::None() { |
| return ChannelConfig(); |
| } |
| @@ -35,7 +38,10 @@ bool ChannelConfig::operator==(const ChannelConfig& b) const { |
| } |
| SessionConfig::SessionConfig() { |
| +} |
| +bool SessionConfig::SupportsCapabilities() const { |
| + return control_config_.version >= kCapabilitiesControlStreamVersion; |
| } |
| // static |
| @@ -171,6 +177,10 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { |
| // Control channel. |
| result->mutable_control_configs()->push_back( |
| ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| + kCapabilitiesControlStreamVersion, |
| + ChannelConfig::CODEC_UNDEFINED)); |
| + result->mutable_control_configs()->push_back( |
| + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, |
| kDefaultStreamVersion, |
| ChannelConfig::CODEC_UNDEFINED)); |
| result->mutable_control_configs()->push_back( |