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

Side by Side Diff: remoting/host/chromoting_host.h

Issue 8764012: Set empty shared secret for Me2Me hosts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years 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 | « no previous file | remoting/host/chromoting_host.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_HOST_CHROMOTING_HOST_H_ 5 #ifndef REMOTING_HOST_CHROMOTING_HOST_H_
6 #define REMOTING_HOST_CHROMOTING_HOST_H_ 6 #define REMOTING_HOST_CHROMOTING_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // Unless specified otherwise all members of this class must be 180 // Unless specified otherwise all members of this class must be
181 // used on the network thread only. 181 // used on the network thread only.
182 182
183 // Parameters specified when the host was created. 183 // Parameters specified when the host was created.
184 ChromotingHostContext* context_; 184 ChromotingHostContext* context_;
185 DesktopEnvironment* desktop_environment_; 185 DesktopEnvironment* desktop_environment_;
186 scoped_refptr<MutableHostConfig> config_; 186 scoped_refptr<MutableHostConfig> config_;
187 HostKeyPair key_pair_; 187 HostKeyPair key_pair_;
188 bool allow_nat_traversal_; 188 bool allow_nat_traversal_;
189 189
190 // TODO(lambroslambrou): The following is a temporary fix for Me2Me
191 // (crbug.com/105995), pending the AuthenticatorFactory work.
192 // Cache the shared secret, in case SetSharedSecret() is called before the
193 // session manager has been created.
194 // The |have_shared_secret_| flag is to distinguish SetSharedSecret() not
195 // being called at all, from being called with an empty string.
196 std::string shared_secret_;
197 bool have_shared_secret_;
198
190 // Connection objects. 199 // Connection objects.
191 scoped_ptr<SignalStrategy> signal_strategy_; 200 scoped_ptr<SignalStrategy> signal_strategy_;
192 std::string local_jid_; 201 std::string local_jid_;
193 scoped_ptr<protocol::SessionManager> session_manager_; 202 scoped_ptr<protocol::SessionManager> session_manager_;
194 203
195 // StatusObserverList is thread-safe and can be used on any thread. 204 // StatusObserverList is thread-safe and can be used on any thread.
196 StatusObserverList status_observers_; 205 StatusObserverList status_observers_;
197 206
198 // The connections to remote clients. 207 // The connections to remote clients.
199 ClientList clients_; 208 ClientList clients_;
(...skipping 22 matching lines...) Expand all
222 bool is_it2me_; 231 bool is_it2me_;
223 std::string access_code_; 232 std::string access_code_;
224 UiStrings ui_strings_; 233 UiStrings ui_strings_;
225 234
226 DISALLOW_COPY_AND_ASSIGN(ChromotingHost); 235 DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
227 }; 236 };
228 237
229 } // namespace remoting 238 } // namespace remoting
230 239
231 #endif // REMOTING_HOST_CHROMOTING_HOST_H_ 240 #endif // REMOTING_HOST_CHROMOTING_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698