OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "remoting/host/security_key/remote_security_key_ipc_server.h" | 5 #include "remoting/host/security_key/remote_security_key_ipc_server.h" |
6 | 6 |
| 7 #include <cstdint> |
7 #include <memory> | 8 #include <memory> |
8 #include <string> | 9 #include <string> |
9 | 10 |
10 #include "base/callback.h" | 11 #include "base/callback.h" |
11 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
12 #include "base/threading/thread_checker.h" | 13 #include "base/threading/thread_checker.h" |
13 #include "base/timer/timer.h" | 14 #include "base/timer/timer.h" |
14 #include "ipc/ipc_channel.h" | 15 #include "ipc/ipc_channel.h" |
15 #include "ipc/ipc_message.h" | 16 #include "ipc/ipc_message.h" |
16 #include "ipc/ipc_message_macros.h" | 17 #include "ipc/ipc_message_macros.h" |
(...skipping 10 matching lines...) Expand all Loading... |
27 | 28 |
28 namespace remoting { | 29 namespace remoting { |
29 | 30 |
30 void RemoteSecurityKeyIpcServer::SetFactoryForTest( | 31 void RemoteSecurityKeyIpcServer::SetFactoryForTest( |
31 RemoteSecurityKeyIpcServerFactory* factory) { | 32 RemoteSecurityKeyIpcServerFactory* factory) { |
32 g_factory = factory; | 33 g_factory = factory; |
33 } | 34 } |
34 | 35 |
35 std::unique_ptr<RemoteSecurityKeyIpcServer> RemoteSecurityKeyIpcServer::Create( | 36 std::unique_ptr<RemoteSecurityKeyIpcServer> RemoteSecurityKeyIpcServer::Create( |
36 int connection_id, | 37 int connection_id, |
| 38 uint32_t peer_session_id, |
37 base::TimeDelta initial_connect_timeout, | 39 base::TimeDelta initial_connect_timeout, |
38 const GnubbyAuthHandler::SendMessageCallback& message_callback, | 40 const GnubbyAuthHandler::SendMessageCallback& message_callback, |
39 const base::Closure& done_callback) { | 41 const base::Closure& done_callback) { |
40 std::unique_ptr<RemoteSecurityKeyIpcServer> ipc_server = | 42 std::unique_ptr<RemoteSecurityKeyIpcServer> ipc_server = |
41 g_factory | 43 g_factory |
42 ? g_factory->Create(connection_id, initial_connect_timeout, | 44 ? g_factory->Create(connection_id, peer_session_id, |
43 message_callback, done_callback) | 45 initial_connect_timeout, message_callback, |
| 46 done_callback) |
44 : base::WrapUnique(new RemoteSecurityKeyIpcServerImpl( | 47 : base::WrapUnique(new RemoteSecurityKeyIpcServerImpl( |
45 connection_id, initial_connect_timeout, message_callback, | 48 connection_id, peer_session_id, initial_connect_timeout, |
46 done_callback)); | 49 message_callback, done_callback)); |
47 | 50 |
48 return ipc_server; | 51 return ipc_server; |
49 } | 52 } |
50 | 53 |
51 } // namespace remoting | 54 } // namespace remoting |
OLD | NEW |