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

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

Issue 7867019: Access Session::config() and Session::jid() on the correct thread only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 9 years, 3 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 | « 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_CHROMOTING_HOST_H_ 5 #ifndef REMOTING_CHROMOTING_HOST_H_
6 #define REMOTING_CHROMOTING_HOST_H_ 6 #define REMOTING_CHROMOTING_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 scoped_refptr<protocol::ConnectionToClient> client); 118 scoped_refptr<protocol::ConnectionToClient> client);
119 virtual void LocalLoginFailed( 119 virtual void LocalLoginFailed(
120 scoped_refptr<protocol::ConnectionToClient> client); 120 scoped_refptr<protocol::ConnectionToClient> client);
121 121
122 // SessionManager::Listener implementation. 122 // SessionManager::Listener implementation.
123 virtual void OnSessionManagerInitialized() OVERRIDE; 123 virtual void OnSessionManagerInitialized() OVERRIDE;
124 virtual void OnIncomingSession( 124 virtual void OnIncomingSession(
125 protocol::Session* session, 125 protocol::Session* session,
126 protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE; 126 protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
127 127
128 void AddAuthenticatedClient(
129 scoped_refptr<protocol::ConnectionToClient> connection,
130 const protocol::SessionConfig& config,
131 const std::string& jid);
132
128 // Sets desired configuration for the protocol. Ownership of the 133 // Sets desired configuration for the protocol. Ownership of the
129 // |config| is transferred to the object. Must be called before Start(). 134 // |config| is transferred to the object. Must be called before Start().
130 void set_protocol_config(protocol::CandidateSessionConfig* config); 135 void set_protocol_config(protocol::CandidateSessionConfig* config);
131 136
132 // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom. 137 // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
133 void set_it2me(bool is_it2me) { 138 void set_it2me(bool is_it2me) {
134 is_it2me_ = is_it2me; 139 is_it2me_ = is_it2me;
135 } 140 }
136 void set_access_code(const std::string& access_code) { 141 void set_access_code(const std::string& access_code) {
137 access_code_ = access_code; 142 access_code_ = access_code;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 std::vector<Task*> shutdown_tasks_; 251 std::vector<Task*> shutdown_tasks_;
247 252
248 UiStrings ui_strings_; 253 UiStrings ui_strings_;
249 254
250 DISALLOW_COPY_AND_ASSIGN(ChromotingHost); 255 DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
251 }; 256 };
252 257
253 } // namespace remoting 258 } // namespace remoting
254 259
255 #endif // REMOTING_HOST_CHROMOTING_HOST_H_ 260 #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