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/gnubby_extension.h" | 5 #include "remoting/host/security_key/gnubby_extension.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "remoting/host/security_key/gnubby_extension_session.h" | 8 #include "remoting/host/security_key/gnubby_extension_session.h" |
8 | 9 |
9 namespace { | 10 namespace { |
10 // TODO(joedow): Update this once clients support sending a gnubby capabililty. | 11 // TODO(joedow): Update this once clients support sending a gnubby capabililty. |
11 // Tracked via: crbug.com/587485 | 12 // Tracked via: crbug.com/587485 |
12 const char kCapability[] = ""; | 13 const char kCapability[] = ""; |
13 } | 14 } |
14 | 15 |
15 namespace remoting { | 16 namespace remoting { |
16 | 17 |
17 GnubbyExtension::GnubbyExtension() {} | 18 GnubbyExtension::GnubbyExtension() {} |
18 | 19 |
19 GnubbyExtension::~GnubbyExtension() {} | 20 GnubbyExtension::~GnubbyExtension() {} |
20 | 21 |
21 std::string GnubbyExtension::capability() const { | 22 std::string GnubbyExtension::capability() const { |
22 return kCapability; | 23 return kCapability; |
23 } | 24 } |
24 | 25 |
25 scoped_ptr<HostExtensionSession> GnubbyExtension::CreateExtensionSession( | 26 std::unique_ptr<HostExtensionSession> GnubbyExtension::CreateExtensionSession( |
26 ClientSessionControl* client_session_control, | 27 ClientSessionControl* client_session_control, |
27 protocol::ClientStub* client_stub) { | 28 protocol::ClientStub* client_stub) { |
28 // TODO(joedow): Update this mechanism to allow for multiple sessions. The | 29 // TODO(joedow): Update this mechanism to allow for multiple sessions. The |
29 // extension will only send messages through the initial | 30 // extension will only send messages through the initial |
30 // |client_stub| with the current design. | 31 // |client_stub| with the current design. |
31 return make_scoped_ptr(new GnubbyExtensionSession(client_stub)); | 32 return base::WrapUnique(new GnubbyExtensionSession(client_stub)); |
32 } | 33 } |
33 | 34 |
34 } // namespace remoting | 35 } // namespace remoting |
OLD | NEW |