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

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: Cache parameter of SetSharedSecret() and use it when session manager is created. 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') | remoting/host/chromoting_host.cc » ('J')
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // Unless specified otherwise all members of this class must be 182 // Unless specified otherwise all members of this class must be
183 // used on the network thread only. 183 // used on the network thread only.
184 184
185 // Parameters specified when the host was created. 185 // Parameters specified when the host was created.
186 ChromotingHostContext* context_; 186 ChromotingHostContext* context_;
187 DesktopEnvironment* desktop_environment_; 187 DesktopEnvironment* desktop_environment_;
188 scoped_refptr<MutableHostConfig> config_; 188 scoped_refptr<MutableHostConfig> config_;
189 HostKeyPair key_pair_; 189 HostKeyPair key_pair_;
190 bool allow_nat_traversal_; 190 bool allow_nat_traversal_;
191 191
192 // TODO(lambroslambrou): The following is a temporary fix for Me2Me
193 // (crbug.com/105995), pending the AuthenticatorFactory work.
194 // Cache the shared secret, in case SetSharedSecret() is called before the
195 // session manager has been created.
196 // The |have_shared_secret_| flag is to distinguish SetSharedSecret() not
197 // being called at all, from being called with an empty string.
198 std::string shared_secret_;
199 bool have_shared_secret_;
200
192 // Connection objects. 201 // Connection objects.
193 scoped_ptr<SignalStrategy> signal_strategy_; 202 scoped_ptr<SignalStrategy> signal_strategy_;
194 std::string local_jid_; 203 std::string local_jid_;
195 scoped_ptr<protocol::SessionManager> session_manager_; 204 scoped_ptr<protocol::SessionManager> session_manager_;
196 205
197 // StatusObserverList is thread-safe and can be used on any thread. 206 // StatusObserverList is thread-safe and can be used on any thread.
198 StatusObserverList status_observers_; 207 StatusObserverList status_observers_;
199 208
200 // The connections to remote clients. 209 // The connections to remote clients.
201 ClientList clients_; 210 ClientList clients_;
(...skipping 23 matching lines...) Expand all
225 bool is_it2me_; 234 bool is_it2me_;
226 std::string access_code_; 235 std::string access_code_;
227 UiStrings ui_strings_; 236 UiStrings ui_strings_;
228 237
229 DISALLOW_COPY_AND_ASSIGN(ChromotingHost); 238 DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
230 }; 239 };
231 240
232 } // namespace remoting 241 } // namespace remoting
233 242
234 #endif // REMOTING_HOST_CHROMOTING_HOST_H_ 243 #endif // REMOTING_HOST_CHROMOTING_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | remoting/host/chromoting_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698