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

Unified Diff: remoting/protocol/session_config.cc

Issue 13932020: Set the initial resolution of an RDP session to the client screen resolution if it is available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Clang Created 7 years, 8 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
« no previous file with comments | « remoting/protocol/session_config.h ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session_config.cc
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc
index 1f05a83182bf91b7ce86337307b5191a9ff28c4a..de1ddc32b7cc80592df2670316e64bf2773c8995 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -11,6 +11,10 @@ namespace protocol {
const int kDefaultStreamVersion = 2;
+// The control channel version that supports the "capabilities" message.
+const int kControlStreamVersion = 3;
+const int kControlStreamVersionNoCapabilities = kDefaultStreamVersion;
+
ChannelConfig ChannelConfig::None() {
return ChannelConfig();
}
@@ -35,14 +39,17 @@ bool ChannelConfig::operator==(const ChannelConfig& b) const {
}
SessionConfig::SessionConfig() {
+}
+bool SessionConfig::SupportsCapabilities() const {
+ return control_config_.version >= kControlStreamVersion;
}
// static
SessionConfig SessionConfig::ForTest() {
SessionConfig result;
result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
- kDefaultStreamVersion,
+ kControlStreamVersionNoCapabilities,
ChannelConfig::CODEC_UNDEFINED));
result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
@@ -171,11 +178,15 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
// Control channel.
result->mutable_control_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
- kDefaultStreamVersion,
+ kControlStreamVersion,
+ ChannelConfig::CODEC_UNDEFINED));
+ result->mutable_control_configs()->push_back(
+ ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
+ kControlStreamVersionNoCapabilities,
ChannelConfig::CODEC_UNDEFINED));
result->mutable_control_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
- kDefaultStreamVersion,
+ kControlStreamVersionNoCapabilities,
ChannelConfig::CODEC_UNDEFINED));
// Event channel.
« no previous file with comments | « remoting/protocol/session_config.h ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698