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

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

Issue 9433027: Delete Session and SessionManager object synchronously. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add tests Created 8 years, 10 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_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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 void ShutdownFinish(); 170 void ShutdownFinish();
171 171
172 // Unless specified otherwise all members of this class must be 172 // Unless specified otherwise all members of this class must be
173 // used on the network thread only. 173 // used on the network thread only.
174 174
175 // Parameters specified when the host was created. 175 // Parameters specified when the host was created.
176 ChromotingHostContext* context_; 176 ChromotingHostContext* context_;
177 DesktopEnvironment* desktop_environment_; 177 DesktopEnvironment* desktop_environment_;
178 protocol::NetworkSettings network_settings_; 178 protocol::NetworkSettings network_settings_;
179 179
180 // TODO(lambroslambrou): The following is a temporary fix for Me2Me
181 // (crbug.com/105995), pending the AuthenticatorFactory work.
182 // Cache the shared secret, in case SetSharedSecret() is called before the
183 // session manager has been created.
184 // The |have_shared_secret_| flag is to distinguish SetSharedSecret() not
185 // being called at all, from being called with an empty string.
186 std::string shared_secret_;
187 bool have_shared_secret_;
188
189 // Connection objects. 180 // Connection objects.
190 SignalStrategy* signal_strategy_; 181 SignalStrategy* signal_strategy_;
191 scoped_ptr<protocol::SessionManager> session_manager_; 182 scoped_ptr<protocol::SessionManager> session_manager_;
192 183
193 // Must be used on the network thread only. 184 // Must be used on the network thread only.
194 ObserverList<HostStatusObserver> status_observers_; 185 ObserverList<HostStatusObserver> status_observers_;
195 186
196 // The connections to remote clients. 187 // The connections to remote clients.
197 ClientList clients_; 188 ClientList clients_;
198 189
(...skipping 24 matching lines...) Expand all
223 // TODO(sergeyu): The following members do not belong to 214 // TODO(sergeyu): The following members do not belong to
224 // ChromotingHost and should be moved elsewhere. 215 // ChromotingHost and should be moved elsewhere.
225 UiStrings ui_strings_; 216 UiStrings ui_strings_;
226 217
227 DISALLOW_COPY_AND_ASSIGN(ChromotingHost); 218 DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
228 }; 219 };
229 220
230 } // namespace remoting 221 } // namespace remoting
231 222
232 #endif // REMOTING_HOST_CHROMOTING_HOST_H_ 223 #endif // REMOTING_HOST_CHROMOTING_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698