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

Side by Side Diff: remoting/protocol/session_config.h

Issue 10834446: Improve handling of NONE transport in channel configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_ 5 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_
6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_ 6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 17 matching lines...) Expand all
28 }; 28 };
29 29
30 enum Codec { 30 enum Codec {
31 CODEC_UNDEFINED, // Used for event and control channels. 31 CODEC_UNDEFINED, // Used for event and control channels.
32 CODEC_VERBATIM, 32 CODEC_VERBATIM,
33 CODEC_ZIP, 33 CODEC_ZIP,
34 CODEC_VP8, 34 CODEC_VP8,
35 CODEC_VORBIS, 35 CODEC_VORBIS,
36 }; 36 };
37 37
38 // The constructor that creates a config with transport field set to
39 // TRANSPORT_NONE which indicates that corresponding channel is disabled.
38 ChannelConfig(); 40 ChannelConfig();
41
42 // Creates a channel config with the specified parameters.
39 ChannelConfig(TransportType transport, int version, Codec codec); 43 ChannelConfig(TransportType transport, int version, Codec codec);
40 44
41 // operator== is overloaded so that std::find() works with 45 // operator== is overloaded so that std::find() works with
42 // std::vector<ChannelConfig>. 46 // std::vector<ChannelConfig>.
43 bool operator==(const ChannelConfig& b) const; 47 bool operator==(const ChannelConfig& b) const;
44 48
45 void Reset();
46
47 TransportType transport; 49 TransportType transport;
48 int version; 50 int version;
49 Codec codec; 51 Codec codec;
50 }; 52 };
51 53
52 // SessionConfig is used by the chromoting Session to store negotiated 54 // SessionConfig is used by the chromoting Session to store negotiated
53 // chromotocol configuration. 55 // chromotocol configuration.
54 class SessionConfig { 56 class SessionConfig {
55 public: 57 public:
56 SessionConfig(); 58 SessionConfig();
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 std::vector<ChannelConfig> control_configs_; 167 std::vector<ChannelConfig> control_configs_;
166 std::vector<ChannelConfig> event_configs_; 168 std::vector<ChannelConfig> event_configs_;
167 std::vector<ChannelConfig> video_configs_; 169 std::vector<ChannelConfig> video_configs_;
168 std::vector<ChannelConfig> audio_configs_; 170 std::vector<ChannelConfig> audio_configs_;
169 }; 171 };
170 172
171 } // namespace protocol 173 } // namespace protocol
172 } // namespace remoting 174 } // namespace remoting
173 175
174 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_ 176 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698