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

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
« no previous file with comments | « remoting/protocol/content_description_unittest.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18 matching lines...) Expand all
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 CODEC_SPEEX, 36 CODEC_SPEEX,
37 }; 37 };
38 38
39 // The constructor that creates a config with transport field set to
40 // TRANSPORT_NONE which indicates that corresponding channel is disabled.
39 ChannelConfig(); 41 ChannelConfig();
42
43 // Creates a channel config with the specified parameters.
40 ChannelConfig(TransportType transport, int version, Codec codec); 44 ChannelConfig(TransportType transport, int version, Codec codec);
41 45
42 // operator== is overloaded so that std::find() works with 46 // operator== is overloaded so that std::find() works with
43 // std::vector<ChannelConfig>. 47 // std::vector<ChannelConfig>.
44 bool operator==(const ChannelConfig& b) const; 48 bool operator==(const ChannelConfig& b) const;
45 49
46 void Reset();
47
48 TransportType transport; 50 TransportType transport;
49 int version; 51 int version;
50 Codec codec; 52 Codec codec;
51 }; 53 };
52 54
53 // SessionConfig is used by the chromoting Session to store negotiated 55 // SessionConfig is used by the chromoting Session to store negotiated
54 // chromotocol configuration. 56 // chromotocol configuration.
55 class SessionConfig { 57 class SessionConfig {
56 public: 58 public:
57 SessionConfig(); 59 SessionConfig();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 std::vector<ChannelConfig> control_configs_; 165 std::vector<ChannelConfig> control_configs_;
164 std::vector<ChannelConfig> event_configs_; 166 std::vector<ChannelConfig> event_configs_;
165 std::vector<ChannelConfig> video_configs_; 167 std::vector<ChannelConfig> video_configs_;
166 std::vector<ChannelConfig> audio_configs_; 168 std::vector<ChannelConfig> audio_configs_;
167 }; 169 };
168 170
169 } // namespace protocol 171 } // namespace protocol
170 } // namespace remoting 172 } // namespace remoting
171 173
172 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_ 174 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_
OLDNEW
« no previous file with comments | « remoting/protocol/content_description_unittest.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698